Thu Oct 30 12:51:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

47 files changed, 362 insertions, 362 deletions

diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.cpp b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
index 61fc9a2f59b..abde51def24 100644
--- a/TAO/orbsvcs/Time_Service/Clerk_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
@@ -66,8 +66,8 @@ Clerk_i::read_ior (const ACE_TCHAR* filename)
            str = ACE_OS::strtok (0, "\n"))
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT("iors -> |%s|\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR(str)));
+                      ACE_TEXT("iors -> |%C|\n"),
+                      str));
 
           CORBA::Object_var objref =
             this->orb_->string_to_object (str);
@@ -258,8 +258,8 @@ Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter,
             {
 
               ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT("Getting IOR of the server: %s\n\n"),
-                          ACE_TEXT_CHAR_TO_TCHAR(binding->binding_name[0].id.in ())));
+                          ACE_TEXT("Getting IOR of the server: %C\n\n"),
+                          binding->binding_name[0].id.in ()));
 
               CosNaming::Name server_name;
               server_name.length (1);
@@ -322,8 +322,8 @@ Clerk_i::create_clerk (void)
 
       // Print the clerk IOR on the console.
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT("[SERVER] Process/Thread Id : (%P/%t) The Time Service CLERK IOR is: <%s>\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR(objref_clerk.in ())));
+                  ACE_TEXT("[SERVER] Process/Thread Id : (%P/%t) The Time Service CLERK IOR is: <%C>\n"),
+                  objref_clerk.in ()));
 
       // Print the Time Service clerk IOR to a file.
       if (this->ior_output_file_)
diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp
index 51b3f974f63..60421473742 100644
--- a/TAO/orbsvcs/Time_Service/Server_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Server_i.cpp
@@ -113,8 +113,8 @@ Server_i::create_server (void)
       // Print the server IOR on the console.
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT("[SERVER] Process/Thread Id : (%P/%t) The Time Service ")
-                  ACE_TEXT("SERVER IOR: <%s>\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR(objref_server.in ())));
+                  ACE_TEXT("SERVER IOR: <%C>\n"),
+                  objref_server.in ()));
 
       // Print the IOR to a file.
 
@@ -177,8 +177,8 @@ Server_i::register_server (void)
                                     this->time_service_server_.in ());
 
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT("Binding ServerContext -> %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR(server_name[1].id.in ())));
+                  ACE_TEXT("Binding ServerContext -> %C\n"),
+                  server_name[1].id.in ()));
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp
index 5e23d5f046e..c09e2b57db1 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp
@@ -485,7 +485,7 @@ void TestServer::buildObjects()
       poaName = poaStream.str();
     }
 
-    ACE_DEBUG((LM_DEBUG, "* Creating POA: %s\n", ACE_TEXT_CHAR_TO_TCHAR (poaName.c_str())));
+    ACE_DEBUG((LM_DEBUG, "* Creating POA: %C\n", poaName.c_str()));
 
     PortableServer::POA_var sub_poa = root_->create_POA(poaName.c_str(), mgr_.in(), policies);
 
@@ -500,7 +500,7 @@ void TestServer::buildObjects()
         objStream << "OBJ_" << serverID_ << "_" << (i + 1) << "_" << (j + 1);
         objName = objStream.str();
       }
-      ACE_DEBUG((LM_DEBUG, "* Activating Obj: %s\n", ACE_TEXT_CHAR_TO_TCHAR (objName.c_str())));
+      ACE_DEBUG((LM_DEBUG, "* Activating Obj: %C\n", objName.c_str()));
 
       PortableServer::ObjectId_var oid = PortableServer::string_to_ObjectId(objName.c_str());
       sub_poa->activate_object_with_id(oid.in(), servant_.get());
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp
index 7d382399e0d..4dc8780b0e7 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp
@@ -205,8 +205,8 @@ RTCosScheduling_ClientScheduler_i::tasks (
   if (ACE_OS::last_error () == EOF)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                        "Node %s not found in config file\n",
-                        ACE_TEXT_CHAR_TO_TCHAR (node_name)),
+                        "Node %C not found in config file\n",
+                        node_name),
                         0);
           break;
         }
@@ -227,8 +227,8 @@ RTCosScheduling_ClientScheduler_i::tasks (
       if (ACE_OS::last_error () == EOF)
         {
           ACE_ERROR_RETURN((LM_ERROR,
-                            "Task list not found for node %s\n",
-                            ACE_TEXT_CHAR_TO_TCHAR (node_name)),
+                            "Task list not found for node %C\n",
+                            node_name),
                             0);
               break;
         }
@@ -250,8 +250,8 @@ RTCosScheduling_ClientScheduler_i::tasks (
       if (ACE_OS::last_error () == EOF)
         {
           ACE_ERROR_RETURN((LM_ERROR,
-                            "Task list not found for node %s\n",
-                            ACE_TEXT_CHAR_TO_TCHAR (node_name)),
+                            "Task list not found for node %C\n",
+                            node_name),
                             0);
           break;
         }
@@ -273,8 +273,8 @@ RTCosScheduling_ClientScheduler_i::tasks (
           else
             {
               ACE_ERROR_RETURN ((LM_ERROR,
-                                "Error in reading activities from %s",
-                                ACE_TEXT_CHAR_TO_TCHAR (file_name)),
+                                "Error in reading activities from %C",
+                                file_name),
                                 0);
             }
         }
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
index fb7a616a9a8..9eef99a23e7 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
@@ -207,8 +207,8 @@ Sender::init (int argc,
 
   if (this->input_file_ == 0)
     ACE_ERROR_RETURN ((LM_DEBUG,
-                       "Cannot open input file %s\n",
-                       ACE_TEXT_CHAR_TO_TCHAR (this->filename_.c_str ())),
+                       "Cannot open input file %C\n",
+                       this->filename_.c_str ()),
                       -1);
   else
     ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
index 536667c5faf..91f32a04855 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
@@ -107,8 +107,8 @@ Distributer_Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flo
 
       //if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
-                    "Handle Conection Requested flowname %s \n",
-                    ACE_TEXT_CHAR_TO_TCHAR (entry.flowname ())));
+                    "Handle Connection Requested flowname %C\n",
+                    entry.flowname ()));
 
       ACE_CString flowname (entry.flowname ());
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
index 9ef59dd8ef9..e27d6c6f70a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
@@ -52,7 +52,7 @@ Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flows
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-                "In Handle Conection Requested \n"));
+                "In Handle Connection Requested \n"));
 
   for (CORBA::ULong i = 0;
        i < flowspec.length ();
@@ -62,8 +62,8 @@ Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flows
       entry.parse (flowspec[i]);
 
       ACE_DEBUG ((LM_DEBUG,
-                  "Handle Conection Requested flowname %s \n",
-                  ACE_TEXT_CHAR_TO_TCHAR (entry.flowname ())));
+                  "Handle Connection Requested flowname %C\n",
+                  entry.flowname ()));
 
       ACE_CString flowname (entry.flowname ());
 
@@ -315,8 +315,8 @@ ACE_TMAIN (int argc,
                        "w");
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_DEBUG,
-                           "Cannot open output file %s\n",
-                           ACE_TEXT_CHAR_TO_TCHAR (receiver.output_file_name ().c_str ())),
+                           "Cannot open output file %C\n",
+                           receiver.output_file_name ().c_str ()),
                           -1);
 
       else
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
index 7dd71e181a7..36bcc66f281 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
@@ -243,8 +243,8 @@ Sender::init (int argc,
 
   if (this->input_file_ == 0)
     ACE_ERROR_RETURN ((LM_DEBUG,
-                       "Cannot open input file %s\n",
-                       ACE_TEXT_CHAR_TO_TCHAR (this->filename_.c_str ())),
+                       "Cannot open input file %C\n",
+                       this->filename_.c_str ()),
                       -1);
   else
     ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
index 5a19a60e97a..31a0c3c72e2 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
@@ -238,7 +238,7 @@ Client::init (int argc, ACE_TCHAR *argv[])
 
       CORBA::String_var s1 = sep_a_->add_fep( fep_a_obj_.in());
 
-      ACE_DEBUG ((LM_DEBUG, "(%N,%l) Added flowendpoint named: %s\n", ACE_TEXT_CHAR_TO_TCHAR (s1.in()) ));
+      ACE_DEBUG ((LM_DEBUG, "(%N,%l) Added flowendpoint named: %C\n", s1.in() ));
 
       this->fp_ = ACE_OS::fopen (this->filename_,"r");
 
@@ -248,8 +248,8 @@ Client::init (int argc, ACE_TCHAR *argv[])
         }
       else
         {
-          ACE_ERROR_RETURN ((LM_ERROR, "ERROR: file %s could not be opened\n",
-                                       ACE_TEXT_CHAR_TO_TCHAR (this->filename_)), -1);
+          ACE_ERROR_RETURN ((LM_ERROR, "ERROR: file %C could not be opened\n",
+                                       this->filename_), -1);
         }
     }
   catch (const CORBA::Exception& ex)
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
index 9715951a2f5..875afcecd16 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
@@ -127,7 +127,7 @@ Server::init (int argc,
 
       CORBA::String_var s1 = sep_b_->add_fep( fep_b_obj_.in() );
 
-     ACE_DEBUG ((LM_DEBUG, "(%N,%l) Added flowendpoint named: %s\n", ACE_TEXT_CHAR_TO_TCHAR (s1.in()) ));
+     ACE_DEBUG ((LM_DEBUG, "(%N,%l) Added flowendpoint named: %C\n", s1.in() ));
 
 
       // Register the mmdevice with the naming service.
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
index 6ff2804fb1c..d4bd8fe9341 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
@@ -132,7 +132,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       CORBA::String_var ior =
         orb->object_to_string (mmdevice.in ());
 
-      ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ACE_TEXT_CHAR_TO_TCHAR (ior.in ())));
+      ACE_DEBUG ((LM_DEBUG, "Activated as <%C>\n", ior.in ()));
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -140,9 +140,9 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
           if (output_file == 0)
             ACE_ERROR_RETURN ((LM_ERROR,
-                               "Cannot open output file %s for writing IOR: %s",
+                               "Cannot open output file %s for writing IOR: %C",
                                ior_output_file,
-                               ACE_TEXT_CHAR_TO_TCHAR (ior.in ()) ),
+                               ior.in ()),
                               1);
           ACE_OS::fprintf (output_file, "%s", ior.in ());
           ACE_OS::fclose (output_file);
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
index baf35bdbaae..d029d1648bb 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
@@ -148,7 +148,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       CORBA::String_var ior =
         orb->object_to_string (mmdevice.in ());
 
-      ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ACE_TEXT_CHAR_TO_TCHAR (ior.in ()) ));
+      ACE_DEBUG ((LM_DEBUG, "Activated as <%C>\n", ior.in () ));
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -156,9 +156,9 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
           if (output_file == 0)
             ACE_ERROR_RETURN ((LM_ERROR,
-                               "Cannot open output file %s for writing IOR: %s",
+                               "Cannot open output file %s for writing IOR: %C",
                                ior_output_file,
-                               ACE_TEXT_CHAR_TO_TCHAR (ior.in ()) ),
+                               ior.in ()),
                               1);
           ACE_OS::fprintf (output_file, "%s", ior.in ());
           ACE_OS::fclose (output_file);
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
index c966ea1e17a..d84ee471402 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
@@ -173,8 +173,8 @@ Sender::init (int argc,
 
   if (this->input_file_ == 0)
     ACE_ERROR_RETURN ((LM_DEBUG,
-                       "Cannot open input file %s\n",
-                       ACE_TEXT_CHAR_TO_TCHAR (this->filename_.c_str ())),
+                       "Cannot open input file %C\n",
+                       this->filename_.c_str ()),
                       -1);
   else
     ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
index c6e1fa212b0..2a0e49e4614 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
@@ -198,8 +198,8 @@ Client::bind_to_server (const char *name)
 
       if (CORBA::is_nil (this->server_mmdevice_.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
-                           " could not resolve Server_Mmdevice in Naming service <%s>\n",
-                           ACE_TEXT_CHAR_TO_TCHAR (name)),
+                           " could not resolve Server_Mmdevice in Naming service <%C>\n",
+                           name),
                           -1);
     }
   catch (const CORBA::Exception& ex)
@@ -238,8 +238,8 @@ Client::init (int argc, ACE_TCHAR *argv[])
     }
   else
     {
-      ACE_ERROR_RETURN ((LM_ERROR, "ERROR: file %s could not be opened\n",
-                                   ACE_TEXT_CHAR_TO_TCHAR (this->filename_)), -1);
+      ACE_ERROR_RETURN ((LM_ERROR, "ERROR: file %C could not be opened\n",
+                                   this->filename_), -1);
     }
 
   return 0;
@@ -273,7 +273,7 @@ Client::run (void)
                                         &addr);
       flow_spec.length (1);
       flow_spec [0] = entry.entry_to_string ();
-      ACE_DEBUG ((LM_DEBUG, "(%N,%l) Flowspec: %s\n", ACE_TEXT_CHAR_TO_TCHAR (entry.entry_to_string()) ));
+      ACE_DEBUG ((LM_DEBUG, "(%N,%l) Flowspec: %C\n", entry.entry_to_string() ));
 
       AVStreams::MMDevice_var client_mmdevice
         = this->client_mmdevice_._this ();
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
index 3ba8d35eda8..7d0c22ae926 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
@@ -210,8 +210,8 @@ Client::bind_to_server (const char *name)
 
       if (CORBA::is_nil (this->server_mmdevice_.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
-                           " could not resolve Server_Mmdevice in Naming service <%s>\n",
-                           ACE_TEXT_CHAR_TO_TCHAR (name)),
+                           " could not resolve Server_Mmdevice in Naming service <%C>\n",
+                           name),
                           -1);
     }
   catch (const CORBA::Exception& ex)
@@ -238,7 +238,7 @@ Client::init (int argc, ACE_TCHAR *argv[])
 
       this->parse_args (this->argc_, this->argv_);
 
-      ACE_DEBUG ((LM_DEBUG, "(%N,%l) Parsed Address  %s\n", ACE_TEXT_CHAR_TO_TCHAR (this->address_)));
+      ACE_DEBUG ((LM_DEBUG, "(%N,%l) Parsed Address  %C\n", this->address_));
 
       ACE_NEW_RETURN (this->fdev_,
                       FTP_Client_FDev,
@@ -287,7 +287,7 @@ Client::run (void)
       AVStreams::streamQoS_var the_qos (new AVStreams::streamQoS);
       AVStreams::flowSpec flow_spec (1);
       // Bind the client and server mmdevices.
-      ACE_DEBUG ((LM_DEBUG, "(%N,%l) Parsed Address %s\n", ACE_TEXT_CHAR_TO_TCHAR (this->address_) ));
+      ACE_DEBUG ((LM_DEBUG, "(%N,%l) Parsed Address %C\n", this->address_));
       ACE_INET_Addr *addr = new ACE_INET_Addr(this->address_);
       TAO_Forward_FlowSpec_Entry entry (this->flowname_,
                                         "IN",
@@ -295,7 +295,7 @@ Client::run (void)
                                         flow_protocol_str,
                                         this->protocol_,
                                         addr);
-      ACE_DEBUG ((LM_DEBUG, "(%N,%l) flowspec: %s\n", ACE_TEXT_CHAR_TO_TCHAR (entry.entry_to_string()) ));
+      ACE_DEBUG ((LM_DEBUG, "(%N,%l) flowspec: %C\n", entry.entry_to_string() ));
       flow_spec.length (1);
       flow_spec [0] = CORBA::string_dup (entry.entry_to_string ());
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
index 9a38db856b4..ed83dcfa98f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
@@ -60,13 +60,13 @@ Receiver_Callback::flowname (const char* flow_name)
                                       "w");
   if (this->output_file_ == 0)
     ACE_ERROR ((LM_DEBUG,
-                "Cannot open output file %s\n",
-                ACE_TEXT_CHAR_TO_TCHAR (this->flowname_.c_str ())));
+                "Cannot open output file %C\n",
+                this->flowname_.c_str ()));
 
   else
     ACE_DEBUG ((LM_DEBUG,
-                "%s File Opened Successfully\n",
-                ACE_TEXT_CHAR_TO_TCHAR (this->flowname_.c_str ())));
+                "%C File Opened Successfully\n",
+                this->flowname_.c_str ()));
 
 
 }
@@ -81,9 +81,9 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
   // the sender.
   //
   ACE_DEBUG ((LM_DEBUG,
-              "Receiver_Callback::receive_frame for frame %d for flow %s\n",
+              "Receiver_Callback::receive_frame for frame %d for flow %C\n",
               this->frame_count_++,
-              ACE_TEXT_CHAR_TO_TCHAR (this->flowname_.c_str ())));
+              this->flowname_.c_str ()));
 
   while (frame != 0)
     {
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
index 11656628774..2933d747686 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
@@ -152,8 +152,8 @@ Sender::init (int argc,
 
   if (this->input_file_ == 0)
     ACE_ERROR_RETURN ((LM_DEBUG,
-                       "Cannot open input file %s\n",
-                       ACE_TEXT_CHAR_TO_TCHAR (this->filename_.c_str ())),
+                       "Cannot open input file %C\n",
+                       this->filename_.c_str ()),
                       -1);
   else
     ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
index f34c0c19d96..1c6f54c1a05 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
@@ -140,8 +140,8 @@ Sender::init (int argc,
 
   if (this->input_file_ == 0)
     ACE_ERROR_RETURN ((LM_DEBUG,
-                       "Cannot open input file %s\n",
-                       ACE_TEXT_CHAR_TO_TCHAR (this->filename_.c_str ())),
+                       "Cannot open input file %C\n",
+                       this->filename_.c_str ()),
                       -1);
   else
     ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
index 77a873d08cb..8ed65fffbe6 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
@@ -140,8 +140,8 @@ Sender::init (int argc,
 
   if (this->input_file_ == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "Cannot open input file %s\n",
-                       ACE_TEXT_CHAR_TO_TCHAR (this->filename_.c_str ())),
+                       "Cannot open input file %C\n",
+                       this->filename_.c_str ()),
                       -1);
   else
     ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
index 4814b315cd7..aad582183d1 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
@@ -238,8 +238,8 @@ Sender::init (int argc,
 
   if (this->input_file_ == 0)
     ACE_ERROR_RETURN ((LM_DEBUG,
-                       "Cannot open input file %s\n",
-                       ACE_TEXT_CHAR_TO_TCHAR (this->filename_.c_str ())),
+                       "Cannot open input file %C\n",
+                       this->filename_.c_str ()),
                       -1);
   else
     ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp
index c1e2928f60c..ff3463de8db 100644
--- a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp
@@ -39,8 +39,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       if (ACE_OS::strcmp (name.in(), "int"))
       {
-        ACE_DEBUG ((LM_DEBUG, "CLIENT (%P): Interface name has been munged - it is now %s\n",
-                      ACE_TEXT_CHAR_TO_TCHAR (name.in())));
+        ACE_DEBUG ((LM_DEBUG, "CLIENT (%P): Interface name has been munged - it is now %C\n",
+                      name.in()));
         return -1;
       }
 
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
index a5ad0d6b711..03f2728b975 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
@@ -321,15 +321,15 @@ int run_remote_test (Simple_Server_ptr server, const ACE_TCHAR* execute_key)
     }
 
   ACE_DEBUG ((LM_DEBUG,
-          ACE_TEXT("CLIENT> REMOTE   expected: '%s'"),
-               ACE_TEXT_CHAR_TO_TCHAR (expected)));
+               ACE_TEXT("CLIENT> REMOTE   expected: '%C'"),
+               expected));
 
   if (ACE_OS::strcmp (expected, received))
   {
       ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("... FAIL\n")
-              ACE_TEXT ("CLIENT>          received: '%s'\n"),
-              ACE_TEXT_CHAR_TO_TCHAR (received)));
+              ACE_TEXT ("CLIENT>          received: '%C'\n"),
+              received));
       return -1;
   }
 
@@ -379,14 +379,14 @@ int run_abort_test (Simple_Server_ptr server,
     }
 
   ACE_DEBUG ((LM_DEBUG,
-          ACE_TEXT("CLIENT> ABORT    expected: '%s'"),
-               ACE_TEXT_CHAR_TO_TCHAR (expected)));
+          ACE_TEXT("CLIENT> ABORT    expected: '%C'"),
+               expected));
   if (ACE_OS::strcmp (expected, received))
     {
       ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("... FAIL\n")
-              ACE_TEXT ("CLIENT>          received: '%s'\n"),
-              ACE_TEXT_CHAR_TO_TCHAR (received)));
+              ACE_TEXT ("CLIENT>          received: '%C'\n"),
+              received));
       return -1;
     }
 
@@ -428,14 +428,14 @@ int run_shutdown_test (Simple_Server_ptr server,
     }
 
   ACE_DEBUG ((LM_DEBUG,
-          ACE_TEXT("CLIENT> SHUTDOWN expected: '%s'"),
-               ACE_TEXT_CHAR_TO_TCHAR (expected)));
+          ACE_TEXT("CLIENT> SHUTDOWN expected: '%C'"),
+               expected));
   if (ACE_OS::strcmp (expected, received))
     {
       ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("... FAIL\n")
-              ACE_TEXT ("CLIENT>          received: '%s'\n"),
-              ACE_TEXT_CHAR_TO_TCHAR (received)));
+              ACE_TEXT ("CLIENT>          received: '%C'\n"),
+              received));
       return -1;
     }
 
@@ -549,8 +549,8 @@ Client_i::init (void)
   if (CORBA::is_nil (server.in ()))
     {
       ACE_ERROR ((LM_ERROR,
-                  "Object reference <%s> is nil\n",
-                  ACE_TEXT_CHAR_TO_TCHAR (data)));
+                  "Object reference <%C> is nil\n",
+                  data));
     }
 
   int rv;
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
index 3a2506eaab9..f5103791028 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
@@ -349,14 +349,14 @@ int run_remote_test (Simple_Server_ptr server, const ACE_TCHAR* execute_key)
     }
 
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT("CLIENT> REMOTE   expected: '%s'"),
-              ACE_TEXT_CHAR_TO_TCHAR (expected)));
+              ACE_TEXT("CLIENT> REMOTE   expected: '%C'"),
+              expected));
   if (ACE_OS::strcmp (expected, received))
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("... FAIL\n")
-                  ACE_TEXT ("CLIENT>          received: '%s'\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (received)));
+                  ACE_TEXT ("CLIENT>          received: '%C'\n"),
+                  received));
       return -1;
     }
 
@@ -403,15 +403,15 @@ int run_abort_test (Simple_Server_ptr server,
     }
 
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT("CLIENT> ABORT    expected: '%s'"),
-              ACE_TEXT_CHAR_TO_TCHAR (expected)));
+              ACE_TEXT("CLIENT> ABORT    expected: '%C'"),
+              expected));
 
   if (ACE_OS::strcmp (expected, received))
   {
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("... FAIL\n")
-                ACE_TEXT ("CLIENT>          received: '%s'\n"),
-                ACE_TEXT_CHAR_TO_TCHAR (received)));
+                ACE_TEXT ("CLIENT>          received: '%C'\n"),
+                received));
     return -1;
   }
 
@@ -461,8 +461,8 @@ Client_i::init (void)
   if (CORBA::is_nil (server.in ()))
   {
     ACE_ERROR ((LM_ERROR,
-                "Object reference <%s> is nil\n",
-                ACE_TEXT_CHAR_TO_TCHAR (iogrstr)));
+                "Object reference <%C> is nil\n",
+                iogrstr));
   }
 
   // run tests
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp
index 6c4912810ef..b3433a21505 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp
@@ -145,9 +145,9 @@ int TestTask::svc()
     output_file= ACE_OS::fopen (ior_output_file, "w");
     if (output_file == 0)
       ACE_ERROR_RETURN ((LM_ERROR,
-                          "Cannot open output file %s for writing IOR: %s\n",
+                          "Cannot open output file %s for writing IOR: %C\n",
                           ior_output_file,
-                          ACE_TEXT_CHAR_TO_TCHAR (ior.in ()) ),
+                          ior.in ()),
                           1);
     ACE_OS::fprintf (output_file, "%s", ior.in ());
     ACE_OS::fclose (output_file);
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp
index 7bccae0bebc..9dd4570db86 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp
@@ -117,9 +117,9 @@ int TestTask::svc()
     FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
     if (output_file == 0)
       ACE_ERROR_RETURN ((LM_ERROR,
-                          "Cannot open output file %s for writing IOR: %s\n",
+                          "Cannot open output file %s for writing IOR: %C\n",
                           ior_output_file,
-                          ACE_TEXT_CHAR_TO_TCHAR (ior.in ()) ),
+                          ior.in ()),
                           1);
     ACE_OS::fprintf (output_file, "%s", ior.in ());
     ACE_OS::fclose (output_file);
diff --git a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Server.cpp b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Server.cpp
index 6e973ad4483..542e9c463e3 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Server.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Server.cpp
@@ -55,9 +55,9 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       FILE *output_file= ACE_OS::fopen (ior_file_name, "w");
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file %s for writing IOR: %s\n",
+                           "Cannot open output file %s for writing IOR: %C\n",
                            ior_file_name,
-                           ACE_TEXT_CHAR_TO_TCHAR (ior.in ())),
+                           ior.in ()),
                           1);
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
@@ -70,9 +70,9 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   catch (CORBA::Exception& exc)
     {
       ACE_ERROR ((LM_ERROR,
-                  "Caught CORBA::Exception\n%s (%s)\n",
-                  ACE_TEXT_CHAR_TO_TCHAR (exc._name ()),
-                  ACE_TEXT_CHAR_TO_TCHAR (exc._rep_id ()) ));
+                  "Caught CORBA::Exception\n%C (%C)\n",
+                  exc._name (),
+                  exc._rep_id ()) );
     }
 #else
   ACE_UNUSED_ARG (argc);
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
index 9e3643ef442..5dbc8b8aa67 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
@@ -106,9 +106,9 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   catch (CORBA::Exception& exc)
   {
     ACE_ERROR ((LM_ERROR,
-    "Caught CORBA::Exception\n%s (%s)\n",
-    ACE_TEXT_CHAR_TO_TCHAR (exc._name ()),
-    ACE_TEXT_CHAR_TO_TCHAR (exc._rep_id ()) ));
+    "Caught CORBA::Exception\n%C (%C)\n",
+    exc._name (),
+    exc._rep_id () ));
   }
 
   return 1;
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
index 8a7d79dc677..50216f31ff9 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
@@ -264,9 +264,9 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   catch (CORBA::Exception& exc)
   {
     ACE_ERROR ((LM_ERROR,
-    "Caught CORBA::Exception\n%s (%s)\n",
-    ACE_TEXT_CHAR_TO_TCHAR (exc._name ()),
-    ACE_TEXT_CHAR_TO_TCHAR (exc._rep_id ()) ));
+    "Caught CORBA::Exception\n%C (%C)\n",
+    exc._name (),
+    exc._rep_id () ));
   }
   return 1;
 }
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
index 728e8e5c056..f2fe0c0d661 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
@@ -277,8 +277,8 @@ Client_i::init (void)
   if (CORBA::is_nil (server.in ()))
     {
       ACE_ERROR ((LM_ERROR,
-                  "Object reference <%s> is nil\n",
-                  ACE_TEXT_CHAR_TO_TCHAR (data)));
+                  "Object reference <%C> is nil\n",
+                  data));
     }
 
   run_test (server.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 feacd30ec74..5dff8bb95ca 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
@@ -345,14 +345,14 @@ IFR_DII_Client::invoke_and_display (void)
       if (this->debug_)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("%s:\t%s\n")
-                      ACE_TEXT ("%s:\t%s\n")
-                      ACE_TEXT ("%s:\t$%2.2f\n"),
-                      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 ()),
+                      ACE_TEXT ("%C:\t%C\n")
+                      ACE_TEXT ("%C:\t%C\n")
+                      ACE_TEXT ("%C:\t$%2.2f\n"),
+                      args->item (0)->name (),
+                      artist,
+                      args->item (1)->name (),
+                      title,
+                      args->item (2)->name (),
                       price));
         }
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp
index d362fac3b73..d349656112e 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp
@@ -34,7 +34,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       return 1;
     }
 
-    ACE_DEBUG ((LM_DEBUG, "Looking up %s", ACE_TEXT_CHAR_TO_TCHAR (member_type_id) ));
+    ACE_DEBUG ((LM_DEBUG, "Looking up %C", member_type_id ));
     CORBA::Contained_var
       dependency = ifr->lookup_id (member_type_id);
     if (CORBA::is_nil (dependency.in ()))
@@ -60,8 +60,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     const char
       *name= tc_content->content_type ()->name ();
     ACE_DEBUG ((LM_DEBUG,
-                " = %s [%u]\n",
-                ACE_TEXT_CHAR_TO_TCHAR (name),
+                " = %C [%u]\n",
+                name,
                 length ));
 
     if (2u == length)
@@ -70,7 +70,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     }
     else
     {
-      ACE_DEBUG ((LM_DEBUG, "Error: Should have been %s [2]\n", ACE_TEXT_CHAR_TO_TCHAR (name) ));
+      ACE_DEBUG ((LM_DEBUG, "Error: Should have been %C [2]\n", name));
       return 2;
     }
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp
index 35fc2ea100f..5cd83c41ae5 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp
@@ -118,8 +118,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     const CORBA::ValueMember& current_member =
       the_value_members [ct];
     ACE_DEBUG ((LM_DEBUG,
-                "value type member '%s'\n",
-                ACE_TEXT_CHAR_TO_TCHAR (current_member.name.in ())));
+                "value type member '%C'\n",
+                current_member.name.in ()));
   }
 
   return 0;
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp
index b2c3a0093f1..f78c99d7aaa 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp
@@ -99,7 +99,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       CORBA::String_var c2_name= c2_def->absolute_name ();
       CORBA::TypeCode_var c2_tc = c2_def->type ();
       CORBA::String_var c2_id = c2_tc->id ();
-      ACE_DEBUG (( LM_DEBUG, "constant \"%s\" is type \"%s\"", ACE_TEXT_CHAR_TO_TCHAR (c2_name.in ()), ACE_TEXT_CHAR_TO_TCHAR (c2_id.in ()) ));
+      ACE_DEBUG (( LM_DEBUG, "constant \"%C\" is type \"%C\"", c2_name.in (), c2_id.in () ));
       CORBA::TCKind c2_tckind = c2_tc->kind ();
       ACE_DEBUG (( LM_DEBUG, ", tkkind %d", c2_tckind ));
       if (CORBA::tk_enum == c2_tckind)
@@ -114,8 +114,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           CORBA::String_var the_strValue = denum->get_as_string ();
           CORBA::ULong the_intValue = denum->get_as_ulong ();
 
-          ACE_DEBUG ((LM_DEBUG, "Whose value is \"%s\" which has an integer value of %d\n",
-                     ACE_TEXT_CHAR_TO_TCHAR (the_strValue.in ()), the_intValue ));
+          ACE_DEBUG ((LM_DEBUG, "Whose value is \"%C\" which has an integer value of %d\n",
+                     the_strValue.in (), the_intValue ));
 
           if (0 == ACE_OS::strcmp( "e1_2", the_strValue.in () ))
             {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
index d4df1929756..28de390cbe2 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
@@ -603,8 +603,8 @@ IDL3_Client::valuetype_test (const char *repo_id,
       if (this->debug_)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "%stype_test: lookup by id failed\n",
-                      ACE_TEXT_CHAR_TO_TCHAR (prefix)));
+                      "%Ctype_test: lookup by id failed\n",
+                      prefix));
         }
 
       return -1;
@@ -618,8 +618,8 @@ IDL3_Client::valuetype_test (const char *repo_id,
       if (this->debug_)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "%stype_test: narrow to ExtValueDef failed\n",
-                      ACE_TEXT_CHAR_TO_TCHAR (prefix)));
+                      "%Ctype_test: narrow to ExtValueDef failed\n",
+                      prefix));
         }
 
       return -1;
@@ -1034,8 +1034,8 @@ IDL3_Client::event_port_test (CORBA::ComponentIR::EventPortDescriptionSeq &eds,
         {
           ACE_DEBUG ((LM_DEBUG,
                       "event_port_test: "
-                      "wrong number of event %s ports\n",
-                      ACE_TEXT_CHAR_TO_TCHAR (port_type)));
+                      "wrong number of event %C ports\n",
+                      port_type));
         }
 
       return -1;
@@ -1053,8 +1053,8 @@ IDL3_Client::event_port_test (CORBA::ComponentIR::EventPortDescriptionSeq &eds,
             {
               ACE_DEBUG ((LM_DEBUG,
                           "event_port_test: "
-                          "wrong local name for %s port #%d\n",
-                          ACE_TEXT_CHAR_TO_TCHAR (port_type),
+                          "wrong local name for %C port #%d\n",
+                          port_type,
                           i + 1));
             }
 
@@ -1069,8 +1069,8 @@ 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",
-                          ACE_TEXT_CHAR_TO_TCHAR (port_type),
+                          "wrong base event type id for %C port #%d\n",
+                          port_type,
                           i + 1));
             }
 
@@ -1092,9 +1092,9 @@ IDL3_Client::valuetype_inheritance_test (CORBA::ExtValueDef_var &vd,
       if (this->debug_)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "%stype_inheritance_test: "
+                      "%Ctype_inheritance_test: "
                       "base valuetype is null\n",
-                      ACE_TEXT_CHAR_TO_TCHAR (prefix)));
+                      prefix));
         }
 
       return -1;
@@ -1107,9 +1107,9 @@ IDL3_Client::valuetype_inheritance_test (CORBA::ExtValueDef_var &vd,
       if (this->debug_)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "%stype_inheritance_test: "
+                      "%Ctype_inheritance_test: "
                       "wrong repo id for base valuetype\n",
-                      ACE_TEXT_CHAR_TO_TCHAR (prefix)));
+                      prefix));
         }
 
       return -1;
@@ -1125,9 +1125,9 @@ IDL3_Client::valuetype_inheritance_test (CORBA::ExtValueDef_var &vd,
       if (this->debug_)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "%stype_inheritance_test: "
+                      "%Ctype_inheritance_test: "
                       "wrong number of supported interfaces\n",
-                      ACE_TEXT_CHAR_TO_TCHAR (prefix)));
+                      prefix));
         }
 
       return -1;
@@ -1143,9 +1143,9 @@ IDL3_Client::valuetype_inheritance_test (CORBA::ExtValueDef_var &vd,
           if (this->debug_)
             {
               ACE_DEBUG ((LM_DEBUG,
-                          "%stype_inheritance_test: "
+                          "%Ctype_inheritance_test: "
                           "bad id on supported interface #%d\n",
-                          ACE_TEXT_CHAR_TO_TCHAR (prefix),
+                          prefix,
                           i + 1));
             }
 
@@ -1167,8 +1167,8 @@ IDL3_Client::valuetype_attribute_test (
       if (this->debug_)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "%stype_attribute_test: wrong number of attrs\n",
-                      ACE_TEXT_CHAR_TO_TCHAR (prefix)));
+                      "%Ctype_attribute_test: wrong number of attrs\n",
+                      prefix));
         }
 
       return -1;
@@ -1185,9 +1185,9 @@ IDL3_Client::valuetype_attribute_test (
           if (this->debug_)
             {
               ACE_DEBUG ((LM_DEBUG,
-                          "%stype_attribute_test: "
+                          "%Ctype_attribute_test: "
                           "wrong local name for attribute #%d\n",
-                          ACE_TEXT_CHAR_TO_TCHAR (prefix),
+                          prefix,
                           i + 1));
             }
 
@@ -1202,9 +1202,9 @@ IDL3_Client::valuetype_attribute_test (
           if (this->debug_)
             {
               ACE_DEBUG ((LM_DEBUG,
-                          "%stype_attribute_test: "
+                          "%Ctype_attribute_test: "
                           "wrong TCKind for attribute #%d\n",
-                          ACE_TEXT_CHAR_TO_TCHAR (prefix),
+                          prefix,
                           i + 1));
             }
 
@@ -1216,10 +1216,10 @@ IDL3_Client::valuetype_attribute_test (
           if (this->debug_)
             {
               ACE_DEBUG ((LM_DEBUG,
-                          "%stype_attribute_test: "
+                          "%Ctype_attribute_test: "
                           "wrong number of get-exceptions"
                           " for attribute #%d\n",
-                          ACE_TEXT_CHAR_TO_TCHAR (prefix),
+                          prefix,
                           i + 1));
             }
 
@@ -1231,10 +1231,10 @@ IDL3_Client::valuetype_attribute_test (
           if (this->debug_)
             {
               ACE_DEBUG ((LM_DEBUG,
-                          "%stype_attribute_test: "
+                          "%Ctype_attribute_test: "
                           "wrong number of put-exceptions"
                           " for attribute #%d\n",
-                          ACE_TEXT_CHAR_TO_TCHAR (prefix),
+                          prefix,
                           i + 1));
             }
 
@@ -1258,9 +1258,9 @@ IDL3_Client::valuetype_operation_test (
       if (this->debug_)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "%stype_operation_test: "
+                      "%Ctype_operation_test: "
                       "wrong number of operations\n",
-                      ACE_TEXT_CHAR_TO_TCHAR (prefix)));
+                      prefix));
         }
 
       return -1;
@@ -1279,9 +1279,9 @@ IDL3_Client::valuetype_operation_test (
           if (this->debug_)
             {
               ACE_DEBUG ((LM_DEBUG,
-                          "%stype_operation_test: "
+                          "%Ctype_operation_test: "
                           "wrong name for operation #%d\n",
-                          ACE_TEXT_CHAR_TO_TCHAR (prefix),
+                          prefix,
                           i + 1));
             }
 
@@ -1296,9 +1296,9 @@ IDL3_Client::valuetype_operation_test (
           if (this->debug_)
             {
               ACE_DEBUG ((LM_DEBUG,
-                          "%stype_operation_test: "
+                          "%Ctype_operation_test: "
                           "wrong return type\n",
-                          ACE_TEXT_CHAR_TO_TCHAR (prefix)));
+                          prefix));
             }
 
           return -1;
@@ -1311,9 +1311,9 @@ IDL3_Client::valuetype_operation_test (
           if (this->debug_)
             {
               ACE_DEBUG ((LM_DEBUG,
-                          "%stype_operation_test: "
+                          "%Ctype_operation_test: "
                           "wrong number of parameters in operation #%d\n",
-                          ACE_TEXT_CHAR_TO_TCHAR (prefix),
+                          prefix,
                           i + 1));
             }
 
@@ -1329,10 +1329,10 @@ IDL3_Client::valuetype_operation_test (
               if (this->debug_)
                 {
                   ACE_DEBUG ((LM_DEBUG,
-                              "%stype_operation_test: "
+                              "%Ctype_operation_test: "
                               "wrong name for operation #%d,"
                               "parameter #%d\n",
-                              ACE_TEXT_CHAR_TO_TCHAR (prefix),
+                              prefix,
                               i + 1,
                               j + 1));
                 }
@@ -1348,9 +1348,9 @@ IDL3_Client::valuetype_operation_test (
           if (this->debug_)
             {
               ACE_DEBUG ((LM_DEBUG,
-                          "%stype_operation_test: "
+                          "%Ctype_operation_test: "
                           "wrong number of exceptions in operation #%d\n",
-                          ACE_TEXT_CHAR_TO_TCHAR (prefix),
+                          prefix,
                           i + 1));
             }
 
@@ -1374,9 +1374,9 @@ IDL3_Client::valuetype_member_test (
       if (this->debug_)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "%stype_member_test: "
+                      "%Ctype_member_test: "
                       "wrong number of members\n",
-                      ACE_TEXT_CHAR_TO_TCHAR (prefix)));
+                      prefix));
         }
 
       return -1;
@@ -1391,9 +1391,9 @@ IDL3_Client::valuetype_member_test (
           if (this->debug_)
             {
               ACE_DEBUG ((LM_DEBUG,
-                          "%stype_member_test: "
+                          "%Ctype_member_test: "
                           "wrong access value in member #%d\n",
-                          ACE_TEXT_CHAR_TO_TCHAR (prefix),
+                          prefix,
                           i + 1));
             }
 
@@ -1407,9 +1407,9 @@ IDL3_Client::valuetype_member_test (
           if (this->debug_)
             {
               ACE_DEBUG ((LM_DEBUG,
-                          "%stype_member_test: "
+                          "%Ctype_member_test: "
                           "wrong repo id for member #%d\n",
-                          ACE_TEXT_CHAR_TO_TCHAR (prefix),
+                          prefix,
                           i + 1));
             }
 
@@ -1433,9 +1433,9 @@ IDL3_Client::valuetype_factory_test (
       if (this->debug_)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "%stype_factory_test: "
+                      "%Ctype_factory_test: "
                       "wrong number of factories\n",
-                      ACE_TEXT_CHAR_TO_TCHAR (prefix)));
+                      prefix));
         }
 
       return -1;
@@ -1453,9 +1453,9 @@ IDL3_Client::valuetype_factory_test (
           if (this->debug_)
             {
               ACE_DEBUG ((LM_DEBUG,
-                          "%stype_factory_test: "
+                          "%Ctype_factory_test: "
                           "wrong number of params in factory #%d\n",
-                          ACE_TEXT_CHAR_TO_TCHAR (prefix),
+                          prefix,
                           i + 1));
             }
 
@@ -1474,9 +1474,9 @@ IDL3_Client::valuetype_factory_test (
               if (this->debug_)
                 {
                   ACE_DEBUG ((LM_DEBUG,
-                              "%stype_factory_test: "
+                              "%Ctype_factory_test: "
                               "wrong name for arg #%d in factory #%d\n",
-                              ACE_TEXT_CHAR_TO_TCHAR (prefix),
+                              prefix,
                               j + 1,
                               i + 1));
                 }
@@ -1492,9 +1492,9 @@ IDL3_Client::valuetype_factory_test (
           if (this->debug_)
             {
               ACE_DEBUG ((LM_DEBUG,
-                          "%stype_factory_test: "
+                          "%Ctype_factory_test: "
                           "wrong number of exceptions in factory #%d\n",
-                          ACE_TEXT_CHAR_TO_TCHAR (prefix),
+                          prefix,
                           i + 1));
             }
 
@@ -1511,9 +1511,9 @@ IDL3_Client::valuetype_factory_test (
               if (this->debug_)
                 {
                   ACE_DEBUG ((LM_DEBUG,
-                              "%stype_factory_test: "
+                              "%Ctype_factory_test: "
                               "wrong name for exception #%d in factory #%d\n",
-                              ACE_TEXT_CHAR_TO_TCHAR (prefix),
+                              prefix,
                               j + 1,
                               i + 1));
                 }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
index 7c91e0c8232..a7b301d6cbc 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
@@ -344,8 +344,8 @@ Admin_Client::enum_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("EnumDef::id: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
+                  ACE_TEXT ("EnumDef::id: %C\n"),
+                  str.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "IDL:my_enum:1.0") == 0);
@@ -355,8 +355,8 @@ Admin_Client::enum_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("EnumDef::name: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
+                  ACE_TEXT ("EnumDef::name: %C\n"),
+                  str.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "my_enum") == 0);
@@ -366,8 +366,8 @@ Admin_Client::enum_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("EnumDef::absolute_name: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
+                  ACE_TEXT ("EnumDef::absolute_name: %C\n"),
+                  str.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_enum") == 0);
@@ -377,8 +377,8 @@ Admin_Client::enum_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("EnumDef::version: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
+                  ACE_TEXT ("EnumDef::version: %C\n"),
+                  str.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "1.0") == 0);
@@ -415,8 +415,8 @@ Admin_Client::enum_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("EnumDef::describe::value::name: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (td->name.in ())));
+                  ACE_TEXT ("EnumDef::describe::value::name: %C\n"),
+                  td->name.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (td->name, "my_enum") == 0);
@@ -424,8 +424,8 @@ Admin_Client::enum_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("EnumDef::describe::value::id: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (td->id.in ())));
+                  ACE_TEXT ("EnumDef::describe::value::id: %C\n"),
+                  td->id.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (td->id, "IDL:my_enum:1.0") == 0);
@@ -433,8 +433,8 @@ Admin_Client::enum_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("EnumDef::describe::value::defined_in: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (td->defined_in.in ())));
+                  ACE_TEXT ("EnumDef::describe::value::defined_in: %C\n"),
+                  td->defined_in.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (td->defined_in, "") == 0);
@@ -442,8 +442,8 @@ Admin_Client::enum_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("EnumDef::describe::value::version: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (td->version.in ())));
+                  ACE_TEXT ("EnumDef::describe::value::version: %C\n"),
+                  td->version.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (td->version, "1.0") == 0);
@@ -464,8 +464,8 @@ Admin_Client::enum_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("EnumDef::describe::value::type::id: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
+                  ACE_TEXT ("EnumDef::describe::value::type::id: %C\n"),
+                  str.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "IDL:my_enum:1.0") == 0);
@@ -475,8 +475,8 @@ Admin_Client::enum_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("EnumDef::describe::value::type::name: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
+                  ACE_TEXT ("EnumDef::describe::value::type::name: %C\n"),
+                  str.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "my_enum") == 0);
@@ -505,9 +505,9 @@ Admin_Client::enum_test (void)
         {
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("EnumDef::describe::value::type::")
-                      ACE_TEXT ("member_name[%d]: %s\n"),
+                      ACE_TEXT ("member_name[%d]: %C\n"),
                       i,
-                      ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
+                      str.in ()));
         }
 
       ACE_ASSERT (ACE_OS::strcmp (str.in (), members[i]) == 0);
@@ -542,9 +542,9 @@ Admin_Client::enum_test (void)
         {
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("EnumDef::")
-                      ACE_TEXT ("members[%d]: %s\n"),
+                      ACE_TEXT ("members[%d]: %C\n"),
                       i,
-                      ACE_TEXT_CHAR_TO_TCHAR (tmp)));
+                      tmp));
         }
 
       ACE_ASSERT (ACE_OS::strcmp (fellows[i], members[i]) == 0);
@@ -562,8 +562,8 @@ Admin_Client::enum_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("EnumDef::name: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
+                  ACE_TEXT ("EnumDef::name: %C\n"),
+                  str.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "another_enum") == 0);
@@ -573,8 +573,8 @@ Admin_Client::enum_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("EnumDef::absolute_name: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
+                  ACE_TEXT ("EnumDef::absolute_name: %C\n"),
+                  str.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "::another_enum") == 0);
@@ -613,8 +613,8 @@ Admin_Client::alias_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("AliasDef::id: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
+                  ACE_TEXT ("AliasDef::id: %C\n"),
+                  str.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "IDL:my_alias:1.0") == 0);
@@ -624,8 +624,8 @@ Admin_Client::alias_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("AliasDef::name: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
+                  ACE_TEXT ("AliasDef::name: %C\n"),
+                  str.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "my_alias") == 0);
@@ -635,8 +635,8 @@ Admin_Client::alias_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("AliasDef::absolute_name: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
+                  ACE_TEXT ("AliasDef::absolute_name: %C\n"),
+                  str.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_alias") == 0);
@@ -646,8 +646,8 @@ Admin_Client::alias_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("AliasDef::version: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
+                  ACE_TEXT ("AliasDef::version: %C\n"),
+                  str.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "1.0") == 0);
@@ -665,8 +665,8 @@ Admin_Client::alias_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("AliasDef::version: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
+                  ACE_TEXT ("AliasDef::version: %C\n"),
+                  str.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "1.1") == 0);
@@ -678,8 +678,8 @@ Admin_Client::alias_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("\nAliasDef::type::name: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
+                  ACE_TEXT ("\nAliasDef::type::name: %C\n"),
+                  str.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "my_alias") == 0);
@@ -756,8 +756,8 @@ Admin_Client::alias_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("\nAliasDef::describe::value::name: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (td->name.in ())));
+                  ACE_TEXT ("\nAliasDef::describe::value::name: %C\n"),
+                  td->name.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (td->name, "my_alias") == 0);
@@ -765,8 +765,8 @@ Admin_Client::alias_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("AliasDef::describe::value::version: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (td->version.in ())));
+                  ACE_TEXT ("AliasDef::describe::value::version: %C\n"),
+                  td->version.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (td->version, "1.1") == 0);
@@ -787,8 +787,8 @@ Admin_Client::alias_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("AliasDef::describe::value::type::id: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
+                  ACE_TEXT ("AliasDef::describe::value::type::id: %C\n"),
+                  str.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "IDL:my_alias:1.0") == 0);
@@ -798,8 +798,8 @@ Admin_Client::alias_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("AliasDef::describe::value::type::name: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
+                  ACE_TEXT ("AliasDef::describe::value::type::name: %C\n"),
+                  str.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "my_alias") == 0);
@@ -845,8 +845,8 @@ Admin_Client::native_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("NativeDef::id: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
+                  ACE_TEXT ("NativeDef::id: %C\n"),
+                  str.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "IDL:my_native:1.0") == 0);
@@ -856,8 +856,8 @@ Admin_Client::native_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("NativeDef::name: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
+                  ACE_TEXT ("NativeDef::name: %C\n"),
+                  str.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "my_native") == 0);
@@ -867,8 +867,8 @@ Admin_Client::native_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("NativeDef::version: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
+                  ACE_TEXT ("NativeDef::version: %C\n"),
+                  str.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "1.0") == 0);
@@ -878,8 +878,8 @@ Admin_Client::native_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("NativeDef::absolute_name: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
+                  ACE_TEXT ("NativeDef::absolute_name: %C\n"),
+                  str.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_native") == 0);
@@ -967,9 +967,9 @@ Admin_Client::struct_test (void)
       if (this->debug_)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("StructDef::type::member_name[%d]: %s\n"),
+                      ACE_TEXT ("StructDef::type::member_name[%d]: %C\n"),
                       i,
-                      ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
+                      str.in ()));
         }
 
       ACE_ASSERT (ACE_OS::strcmp (str.in (), members[i].name) == 0);
@@ -984,8 +984,8 @@ Admin_Client::struct_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("\nStructDef::describe::value::name: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (td->name.in ())));
+                  ACE_TEXT ("\nStructDef::describe::value::name: %C\n"),
+                  td->name.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (td->name, "my_struct") == 0);
@@ -993,8 +993,8 @@ Admin_Client::struct_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("StructDef::describe::value::id: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (td->id.in ())));
+                  ACE_TEXT ("StructDef::describe::value::id: %C\n"),
+                  td->id.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (td->id, "IDL:my_struct:1.0") == 0);
@@ -1002,8 +1002,8 @@ Admin_Client::struct_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("StructDef::describe::value::version: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (td->version.in ())));
+                  ACE_TEXT ("StructDef::describe::value::version: %C\n"),
+                  td->version.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (td->version, "1.0") == 0);
@@ -1049,9 +1049,9 @@ Admin_Client::struct_test (void)
       if (this->debug_)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("StructDef::members[%d]::name: %s\n"),
+                      ACE_TEXT ("StructDef::members[%d]::name: %C\n"),
                       i,
-                      ACE_TEXT_CHAR_TO_TCHAR (out_members[i].name.in ())));
+                      out_members[i].name.in ()));
         }
 
       if (i == length - 1)
@@ -1075,8 +1075,8 @@ Admin_Client::struct_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("Repository::lookup::absolute_name: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
+                  ACE_TEXT ("Repository::lookup::absolute_name: %C\n"),
+                  str.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_struct::my_enum") == 0);
@@ -1088,8 +1088,8 @@ Admin_Client::struct_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("StructDef::lookup::absolute_name: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
+                  ACE_TEXT ("StructDef::lookup::absolute_name: %C\n"),
+                  str.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_struct::my_enum") == 0);
@@ -1104,8 +1104,8 @@ Admin_Client::struct_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("StructDef::lookup::defined_in::")
-                  ACE_TEXT ("absolute_name: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
+                  ACE_TEXT ("absolute_name: %C\n"),
+                  str.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_struct") == 0);
@@ -1147,9 +1147,9 @@ Admin_Client::struct_test (void)
         {
           ACE_DEBUG ((
               LM_DEBUG,
-              ACE_TEXT ("StructDef::contents[%d]::absolute_name: %s\n"),
+              ACE_TEXT ("StructDef::contents[%d]::absolute_name: %C\n"),
               i,
-              ACE_TEXT_CHAR_TO_TCHAR (str.in ())
+              str.in ()
             ));
         }
 
@@ -1187,9 +1187,9 @@ Admin_Client::struct_test (void)
         {
           ACE_DEBUG ((
               LM_DEBUG,
-              ACE_TEXT ("Repository::lookup_name[%d]::absolute_name: %s\n"),
+              ACE_TEXT ("Repository::lookup_name[%d]::absolute_name: %C\n"),
               i,
-              ACE_TEXT_CHAR_TO_TCHAR (str.in ())
+              str.in ()
             ));
         }
 
@@ -1224,9 +1224,9 @@ Admin_Client::struct_test (void)
         {
           ACE_DEBUG ((
               LM_DEBUG,
-              ACE_TEXT ("Repository::describe_contents[%d]::id: %s\n"),
+              ACE_TEXT ("Repository::describe_contents[%d]::id: %C\n"),
               i,
-              ACE_TEXT_CHAR_TO_TCHAR (str.in ())
+              str.in ()
             ));
         }
 
@@ -1272,9 +1272,9 @@ Admin_Client::struct_test (void)
         {
           ACE_DEBUG ((
               LM_DEBUG,
-              ACE_TEXT ("StructDef::contents[%d]::absolute_name: %s\n"),
+              ACE_TEXT ("StructDef::contents[%d]::absolute_name: %C\n"),
               i,
-              ACE_TEXT_CHAR_TO_TCHAR (str.in ())
+              str.in ()
             ));
         }
 
@@ -1445,9 +1445,9 @@ Admin_Client::union_test (void)
       if (this->debug_)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("UnionDef::type::member_name[%d]: %s\n"),
+                      ACE_TEXT ("UnionDef::type::member_name[%d]: %C\n"),
                       i,
-                      ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
+                      str.in ()));
         }
 
       // Multiple labels for first member shifts index by 1.
@@ -1474,9 +1474,9 @@ Admin_Client::union_test (void)
       if (this->debug_)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("UnionDef::type::member_label[%d]: %s\n"),
+                      ACE_TEXT ("UnionDef::type::member_label[%d]: %C\n"),
                       i,
-                      ACE_TEXT_CHAR_TO_TCHAR (i == (CORBA::ULong) slot ? "default" : tmp)));
+                      i == (CORBA::ULong) slot ? "default" : tmp)))
         }
 
       // Labels are not in order.
@@ -1568,9 +1568,9 @@ Admin_Client::exception_test (void)
       if (this->debug_)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("ExceptionDef::type::member_name[%d]: %s\n"),
+                      ACE_TEXT ("ExceptionDef::type::member_name[%d]: %C\n"),
                       i,
-                      ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
+                      str.in ()));
         }
 
       ACE_ASSERT (ACE_OS::strcmp (str.in (), members[i].name) == 0);
@@ -1585,8 +1585,8 @@ Admin_Client::exception_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("\nExceptionDef::describe::value::name: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (ed->name.in ())));
+                  ACE_TEXT ("\nExceptionDef::describe::value::name: %C\n"),
+                  ed->name.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (ed->name, "my_exception") == 0);
@@ -1594,8 +1594,8 @@ Admin_Client::exception_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("ExceptionDef::describe::value::id: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (ed->id.in ())));
+                  ACE_TEXT ("ExceptionDef::describe::value::id: %C\n"),
+                  ed->id.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (ed->id, "IDL:my_exception:1.0") == 0);
@@ -1603,8 +1603,8 @@ Admin_Client::exception_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("ExceptionDef::describe::value::defined_in: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (ed->defined_in.in ())));
+                  ACE_TEXT ("ExceptionDef::describe::value::defined_in: %C\n"),
+                  ed->defined_in.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (ed->defined_in, "") == 0);
@@ -1612,8 +1612,8 @@ Admin_Client::exception_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("ExceptionDef::describe::value::version: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (ed->version.in ())));
+                  ACE_TEXT ("ExceptionDef::describe::value::version: %C\n"),
+                  ed->version.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (ed->version, "1.0") == 0);
@@ -1661,9 +1661,9 @@ Admin_Client::exception_test (void)
     {
       if (this->debug_)
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("ExceptionDef::members[%d]::name: %s\n"),
+                    ACE_TEXT ("ExceptionDef::members[%d]::name: %C\n"),
                     i,
-                    ACE_TEXT_CHAR_TO_TCHAR (out_members[i].name.in ())));
+                    out_members[i].name.in ()));
 
       if (i == 2)
         {
@@ -1695,9 +1695,9 @@ Admin_Client::exception_test (void)
       if (this->debug_)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("ExceptionDef::members[%d]::name: %s\n"),
+                      ACE_TEXT ("ExceptionDef::members[%d]::name: %C\n"),
                       i,
-                      ACE_TEXT_CHAR_TO_TCHAR (out_members[i].name.in ())));
+                      out_members[i].name.in ()));
         }
 
       if (i == 1)
@@ -1777,9 +1777,9 @@ Admin_Client::exception_test (void)
         {
           ACE_DEBUG ((
               LM_DEBUG,
-              ACE_TEXT ("ExceptionDef::contents[%d]::absolute_name: %s\n"),
+              ACE_TEXT ("ExceptionDef::contents[%d]::absolute_name: %C\n"),
               i,
-              ACE_TEXT_CHAR_TO_TCHAR (str.in ())
+              str.in ()
             ));
         }
 
@@ -1811,9 +1811,9 @@ Admin_Client::exception_test (void)
         {
           ACE_DEBUG ((
               LM_DEBUG,
-              ACE_TEXT ("Repository::lookup_name%d]::absolute_name: %s\n"),
+              ACE_TEXT ("Repository::lookup_name%d]::absolute_name: %C\n"),
               i,
-              ACE_TEXT_CHAR_TO_TCHAR (str.in ())
+              str.in ()
             ));
         }
 
@@ -1864,9 +1864,9 @@ Admin_Client::exception_test (void)
             {
               ACE_DEBUG ((LM_DEBUG,
                           ACE_TEXT ("Repository::describe_contents[%d]")
-                          ACE_TEXT ("::value::name: %s\n"),
+                          ACE_TEXT ("::value::name: %C\n"),
                           i,
-                          ACE_TEXT_CHAR_TO_TCHAR (ed->name.in ())));
+                          ed->name.in ()));
             }
 
           ACE_ASSERT (ACE_OS::strcmp (ed->name, "my_exception") == 0);
@@ -1893,9 +1893,9 @@ Admin_Client::exception_test (void)
             {
               ACE_DEBUG ((LM_DEBUG,
                           ACE_TEXT ("Repository::describe_contents[%d]")
-                          ACE_TEXT ("::value::name: %s\n"),
+                          ACE_TEXT ("::value::name: %C\n"),
                           i,
-                          ACE_TEXT_CHAR_TO_TCHAR (td->name.in ())));
+                          td->name.in ()));
             }
 
           ACE_ASSERT (ACE_OS::strcmp (td->name, "my_enum") == 0);
@@ -1924,9 +1924,9 @@ Admin_Client::exception_test (void)
         {
           ACE_DEBUG ((
               LM_DEBUG,
-              ACE_TEXT ("ExceptionDef::contents[%d]::absolute_name: %s\n"),
+              ACE_TEXT ("ExceptionDef::contents[%d]::absolute_name: %C\n"),
               i,
-              ACE_TEXT_CHAR_TO_TCHAR (str.in ())
+              str.in ()
             ));
         }
 
@@ -2002,8 +2002,8 @@ Admin_Client::constant_test (void)
   if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("ConstantDef::value (string): %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (out_s)));
+                  ACE_TEXT ("ConstantDef::value (string): %C\n"),
+                  out_s));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (out_s, s) == 0);
@@ -2116,8 +2116,8 @@ Admin_Client::constant_test (void)
 #if defined (ACE_LACKS_LONGLONG_T)
       char buffer[32];
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("ConstantDef::value (ulonglong): %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (out_ull_val.as_string (buffer))));
+                  ACE_TEXT ("ConstantDef::value (ulonglong): %C\n"),
+                  out_ull_val.as_string (buffer)));
 #else
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("ConstantDef::value (ulonglong): %Q\n"),
@@ -2277,9 +2277,9 @@ Admin_Client::interface_test (void)
         {
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("OperationDef::describe::parameters[%d]::")
-                      ACE_TEXT ("name: %s\n"),
+                      ACE_TEXT ("name: %C\n"),
                       i,
-                      ACE_TEXT_CHAR_TO_TCHAR (tmp)));
+                      tmp));
         }
 
       ACE_ASSERT (ACE_OS::strcmp (tmp, names[i]) == 0);
@@ -2338,8 +2338,8 @@ Admin_Client::interface_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("\nInterfaceDef::describe_interface::")
-                  ACE_TEXT ("type::id: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
+                  ACE_TEXT ("type::id: %C\n"),
+                  str.in ()));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "IDL:p_iface:1.0") == 0);
@@ -2376,9 +2376,9 @@ Admin_Client::interface_test (void)
         {
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("InterfaceDef::describe_interface::")
-                      ACE_TEXT ("operations[0]::contexts[%d]: %s\n"),
+                      ACE_TEXT ("operations[0]::contexts[%d]: %C\n"),
                       i,
-                      ACE_TEXT_CHAR_TO_TCHAR (tmp)));
+                      tmp));
         }
 
       ACE_ASSERT (ACE_OS::strcmp (tmp, contexts[i]) == 0);
@@ -2404,9 +2404,9 @@ Admin_Client::interface_test (void)
         {
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("InterfaceDef::describe::operations[3]::")
-                      ACE_TEXT ("contexts[%d]: %s\n"),
+                      ACE_TEXT ("contexts[%d]: %C\n"),
                       i,
-                      ACE_TEXT_CHAR_TO_TCHAR (tmp)));
+                      tmp));
         }
 
       ACE_ASSERT (ACE_OS::strcmp (tmp, "if_exception") == 0);
@@ -2418,8 +2418,8 @@ Admin_Client::interface_test (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("\nInterfaceDef::describe_interface::")
-                  ACE_TEXT ("attributes::defined_in: %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (tmp)));
+                  ACE_TEXT ("attributes::defined_in: %C\n"),
+                  tmp));
     }
 
   ACE_ASSERT (ACE_OS::strcmp (tmp, "IDL:gp_iface:1.0") == 0);
@@ -2459,9 +2459,9 @@ Admin_Client::interface_test (void)
         {
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("InterfaceDef::describe::")
-                      ACE_TEXT ("base_interfaces[%d]: %s\n"),
+                      ACE_TEXT ("base_interfaces[%d]: %C\n"),
                       i,
-                      ACE_TEXT_CHAR_TO_TCHAR (base_iface_id)));
+                      base_iface_id));
         }
     }
 
@@ -2487,9 +2487,9 @@ Admin_Client::interface_test (void)
         {
           ACE_DEBUG ((
               LM_DEBUG,
-              ACE_TEXT ("InterfaceDef::base_interfaces[%d]::name: %s\n"),
+              ACE_TEXT ("InterfaceDef::base_interfaces[%d]::name: %C\n"),
               i,
-              ACE_TEXT_CHAR_TO_TCHAR (str.in ())
+              str.in ()
             ));
         }
     }
@@ -2515,9 +2515,9 @@ Admin_Client::interface_test (void)
       if (this->debug_)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("InterfaceDef::contents[%d]::name: %s\n"),
+                      ACE_TEXT ("InterfaceDef::contents[%d]::name: %C\n"),
                       i,
-                      ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
+                      str.in ()));
         }
 
       CORBA::Container_var cr =
@@ -2532,9 +2532,9 @@ Admin_Client::interface_test (void)
         {
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("InterfaceDef::contents[%d]::")
-                      ACE_TEXT ("defined_in::name: %s\n"),
+                      ACE_TEXT ("defined_in::name: %C\n"),
                       i,
-                      ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
+                      str.in ()));
         }
 
       ACE_ASSERT (ACE_OS::strcmp (str.in (), "p_iface") == 0
@@ -2655,9 +2655,9 @@ Admin_Client::move_test (void)
       if (this->debug_)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("UnionDef::members[%d]::name: %s\n"),
+                      ACE_TEXT ("UnionDef::members[%d]::name: %C\n"),
                       i,
-                      ACE_TEXT_CHAR_TO_TCHAR (tmp)));
+                      tmp));
         }
 
       ACE_ASSERT (ACE_OS::strcmp (tmp, u_members[i].name) == 0);
@@ -2708,9 +2708,9 @@ Admin_Client::move_test (void)
       if (this->debug_)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("UnionDef::members[%d]::name: %s\n"),
+                      ACE_TEXT ("UnionDef::members[%d]::name: %C\n"),
                       i,
-                      ACE_TEXT_CHAR_TO_TCHAR (tmp)));
+                      tmp));
         }
 
       if (i == 0)
@@ -2747,9 +2747,9 @@ Admin_Client::move_test (void)
         {
           ACE_DEBUG ((
               LM_DEBUG,
-              ACE_TEXT ("UnionDef::contents[%d]::absolute_name: %s\n"),
+              ACE_TEXT ("UnionDef::contents[%d]::absolute_name: %C\n"),
               i,
-              ACE_TEXT_CHAR_TO_TCHAR (str.in ())
+              str.in ()
             ));
         }
 
@@ -2808,9 +2808,9 @@ Admin_Client::move_test (void)
       if (this->debug_)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("UnionDef::members[%d]::name: %s\n"),
+                      ACE_TEXT ("UnionDef::members[%d]::name: %C\n"),
                       i,
-                      ACE_TEXT_CHAR_TO_TCHAR (tmp)));
+                      tmp));
         }
 
       ACE_ASSERT (ACE_OS::strcmp (tmp, u_names[i]) == 0);
@@ -2841,9 +2841,9 @@ Admin_Client::move_test (void)
       if (this->debug_)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("UnionDef::contents[%d]::absolute_name: %s\n"),
+                      ACE_TEXT ("UnionDef::contents[%d]::absolute_name: %C\n"),
                       i,
-                      ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
+                      str.in ()));
         }
 
       cmp_result =
@@ -2880,9 +2880,9 @@ Admin_Client::move_test (void)
       if (this->debug_)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("StructDef::contents[%d]::absolute_name: %s\n"),
+                      ACE_TEXT ("StructDef::contents[%d]::absolute_name: %C\n"),
                       i,
-                      ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
+                      str.in ()));
         }
 
       cmp_result =
@@ -2917,9 +2917,9 @@ Admin_Client::move_test (void)
       if (this->debug_)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("StructDef::members[%d]::name: %s\n"),
+                      ACE_TEXT ("StructDef::members[%d]::name: %C\n"),
                       i,
-                      ACE_TEXT_CHAR_TO_TCHAR (tmp)));
+                      tmp));
         }
 
       ACE_ASSERT (ACE_OS::strcmp (tmp, s_names[i]) == 0);
@@ -3040,8 +3040,8 @@ Admin_Client::module_test (void)
     {
       ACE_DEBUG ((
           LM_DEBUG,
-          ACE_TEXT ("ModuleDef::lookup (absolute)::absolute_name: %s\n"),
-          ACE_TEXT_CHAR_TO_TCHAR (str.in ())
+          ACE_TEXT ("ModuleDef::lookup (absolute)::absolute_name: %C\n"),
+          str.in ()
         ));
     }
 
@@ -3058,8 +3058,8 @@ Admin_Client::module_test (void)
     {
       ACE_DEBUG ((
           LM_DEBUG,
-          ACE_TEXT ("ModuleDef::lookup (relative)::absolute_name: %s\n"),
-          ACE_TEXT_CHAR_TO_TCHAR (str.in ())
+          ACE_TEXT ("ModuleDef::lookup (relative)::absolute_name: %C\n"),
+          str.in ()
         ));
     }
 
@@ -3093,9 +3093,9 @@ Admin_Client::module_test (void)
         {
           ACE_DEBUG ((
               LM_DEBUG,
-              ACE_TEXT ("Repository::lookup_name[%d]::absolute_name: %s\n"),
+              ACE_TEXT ("Repository::lookup_name[%d]::absolute_name: %C\n"),
               i,
-              ACE_TEXT_CHAR_TO_TCHAR (str.in ())
+              str.in ()
             ));
         }
 
@@ -3129,9 +3129,9 @@ Admin_Client::module_test (void)
         {
           ACE_DEBUG ((
               LM_DEBUG,
-              ACE_TEXT ("Repository::lookup_name[%d]::absolute_name: %s\n"),
+              ACE_TEXT ("Repository::lookup_name[%d]::absolute_name: %C\n"),
               i,
-              ACE_TEXT_CHAR_TO_TCHAR (str.in ())
+              str.in ()
             ));
         }
 
@@ -3172,9 +3172,9 @@ Admin_Client::module_test (void)
         {
           ACE_DEBUG ((
               LM_DEBUG,
-              ACE_TEXT ("Repository::lookup_name[%d]::absolute_name: %s\n"),
+              ACE_TEXT ("Repository::lookup_name[%d]::absolute_name: %C\n"),
               i,
-              ACE_TEXT_CHAR_TO_TCHAR (str.in ())
+              str.in ()
             ));
         }
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
index fcb00f68240..fc7606b14ea 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
@@ -218,9 +218,9 @@ Ptest::query (void)
       if (this->debug_)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("StructDef::members[%d]::name: %s\n"),
+                      ACE_TEXT ("StructDef::members[%d]::name: %C\n"),
                       i,
-                      ACE_TEXT_CHAR_TO_TCHAR (out_members[i].name.in ())));
+                      out_members[i].name.in ()));
         }
 
       if (i == length - 1)
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
index 57face8f408..5950b53d657 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
@@ -193,9 +193,9 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         if (output_file == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
           "Cannot open output file %s for "
-          "writing IOR: %s",
+          "writing IOR: %C",
           ior_output_file,
-          ACE_TEXT_CHAR_TO_TCHAR (ior.in ())),
+          ior.in ()),
           1);
         ACE_OS::fprintf (output_file, "%s", ior.in ());
         ACE_OS::fclose (output_file);
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp
index 0fe5ce0f48c..2ce242dca15 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp
@@ -203,9 +203,9 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
               if (output_file == 0)
                 ACE_ERROR_RETURN ((LM_ERROR,
                                    "Cannot open output file %s for "
-                                   "writing IOR: %s",
+                                   "writing IOR: %C",
                                    ior_output_file,
-                                   ACE_TEXT_CHAR_TO_TCHAR (ior.in ())),
+                                   ior.in ()),
                                   1);
               ACE_OS::fprintf (output_file, "%s", ior.in ());
               ACE_OS::fclose (output_file);
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
index ae229073231..43e2318f8e7 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
@@ -210,9 +210,9 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
         "Cannot open output file %s for "
-        "writing IOR: %s",
+        "writing IOR: %C",
         ior_output_file,
-        ACE_TEXT_CHAR_TO_TCHAR (ior.in ())),
+        ior.in ()),
         1);
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
index 04cd1895217..bf6ee1b19d8 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
@@ -224,9 +224,9 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
         "Cannot open output file %s for "
-        "writing IOR: %s",
+        "writing IOR: %C",
         ior_output_file,
-        ACE_TEXT_CHAR_TO_TCHAR (ior.in ())),
+        ior.in ()),
         1);
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
index daebf28aeba..3356d0c552d 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
@@ -220,9 +220,9 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
         "Cannot open output file %s for "
-        "writing IOR: %s",
+        "writing IOR: %C",
         ior_output_file,
-        ACE_TEXT_CHAR_TO_TCHAR (ior.in ())),
+        ior.in ()),
         1);
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
diff --git a/TAO/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp
index a5c1cf55c5d..eafbf0313d3 100644
--- a/TAO/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp
@@ -224,9 +224,9 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         if (output_file == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
           "Cannot open output file %s for "
-          "writing IOR: %s",
+          "writing IOR: %C",
           ior_output_file,
-          ACE_TEXT_CHAR_TO_TCHAR (ior.in ())),
+          ior.in ()),
           1);
         ACE_OS::fprintf (output_file, "%s", ior.in ());
         ACE_OS::fclose (output_file);
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
index e3b37a52678..b322efcdc1c 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
@@ -225,7 +225,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           "Cannot open output file %s for "
           "writing IOR: %s",
           ior_output_file,
-          ACE_TEXT_CHAR_TO_TCHAR (ior.in ())),
+          ior.in ()),
           1);
         ACE_OS::fprintf (output_file, "%s", ior.in ());
         ACE_OS::fclose (output_file);
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
index 8a65de812de..b459ab8a1f1 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
@@ -225,9 +225,9 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         if (output_file == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
           "Cannot open output file %s for "
-          "writing IOR: %s",
+          "writing IOR: %C",
           ior_output_file,
-          ACE_TEXT_CHAR_TO_TCHAR (ior.in ())),
+          ior.in ()),
           1);
         ACE_OS::fprintf (output_file, "%s", ior.in ());
         ACE_OS::fclose (output_file);
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
index 6763b681d81..a1025de2028 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
@@ -204,9 +204,9 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         if (output_file == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
           "Cannot open output file %s for "
-          "writing IOR: %s",
+          "writing IOR: %C",
           ior_output_file,
-          ACE_TEXT_CHAR_TO_TCHAR (ior.in ())),
+          ior.in ()),
           1);
         ACE_OS::fprintf (output_file, "%s", ior.in ());
         ACE_OS::fclose (output_file);
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
index bbe94967909..8063e25ffbe 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
@@ -198,9 +198,9 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         if (output_file == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
           "Cannot open output file %s for "
-          "writing IOR: %s",
+          "writing IOR: %C",
           ior_output_file,
-          ACE_TEXT_CHAR_TO_TCHAR (ior.in ())),
+          ior.in ()),
           1);
         ACE_OS::fprintf (output_file, "%s", ior.in ());
         ACE_OS::fclose (output_file);
diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp
index 0b97b1b602b..b1ea6eff065 100644
--- a/TAO/orbsvcs/tests/Time/Client_i.cpp
+++ b/TAO/orbsvcs/tests/Time/Client_i.cpp
@@ -334,8 +334,8 @@ Client_i::obtain_initial_references (void)
       clerk_name[1].id = CORBA::string_dup (name);
 
       ACE_DEBUG ((LM_DEBUG,
-                  "%s|\n",
-                  ACE_TEXT_CHAR_TO_TCHAR (name)));
+                  "%C|\n",
+                  name));
 
       CORBA::Object_var temp_object =
         my_name_client_->resolve (clerk_name);
@@ -386,8 +386,8 @@ Client_i::init (int argc, ACE_TCHAR **argv)
 
           if (CORBA::is_nil (server_object.in ()))
             ACE_ERROR_RETURN ((LM_ERROR,
-                               "invalid ior <%s>\n",
-                               ACE_TEXT_CHAR_TO_TCHAR (this->ior_)),
+                               "invalid ior <%C>\n",
+                               this->ior_),
                               -1);
           this->clerk_ =
             CosTime::TimeService::_narrow (server_object.in ());