Sun Oct 12 20:53:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

33 files changed, 143 insertions, 146 deletions

diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp
index a2fa43dd0b1..72dae612f59 100644
--- a/TAO/tao/Acceptor_Registry.cpp
+++ b/TAO/tao/Acceptor_Registry.cpp
@@ -160,8 +160,8 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
             {
               ACE_ERROR ((LM_ERROR,
                           ACE_TEXT ("(%P|%t) Invalid endpoint ")
-                          ACE_TEXT ("specification: <%s>.\n"),
-                          ACE_TEXT_CHAR_TO_TCHAR (iop.c_str ())));
+                          ACE_TEXT ("specification: <%C>.\n"),
+                          iop.c_str ()));
             }
 
           throw ::CORBA::BAD_PARAM (
@@ -247,8 +247,8 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
             {
               ACE_ERROR ((LM_ERROR,
                           ACE_TEXT ("(%P|%t) Invalid endpoint ")
-                          ACE_TEXT ("specification: <%s>.\n"),
-                          ACE_TEXT_CHAR_TO_TCHAR (iop.c_str ())));
+                          ACE_TEXT ("specification: <%C>.\n"),
+                          iop.c_str ()));
             }
 
           throw ::CORBA::BAD_PARAM (
@@ -382,9 +382,8 @@ int TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core,
                       ACE_ERROR ((
                           LM_ERROR,
                           ACE_TEXT ("TAO (%P|%t) unable to create ")
-                          ACE_TEXT ("an acceptor for <%s>\n"),
-                          ACE_TEXT_CHAR_TO_TCHAR ((*i)->
-                            protocol_name ().c_str ())
+                          ACE_TEXT ("an acceptor for <%C>\n"),
+                          (*i)->protocol_name ().c_str ()
                         ));
                     }
 
@@ -396,7 +395,7 @@ int TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core,
                   // Open first acceptor on IPv4 ANY
                   ACE_INET_Addr addr(static_cast<unsigned short> (0));
 
-                  TAO_IIOP_Acceptor* iiop_acceptor = 
+                  TAO_IIOP_Acceptor* iiop_acceptor =
                     dynamic_cast<TAO_IIOP_Acceptor*> (acceptor);
 
                   if (!iiop_acceptor)
@@ -416,7 +415,7 @@ int TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core,
                     }
 
                   // record the port chosen for the IPv4 acceptor
-                  u_short port = 
+                  u_short port =
                     iiop_acceptor->default_address ().get_port_number ();
 
                   // Create second acceptor for IPV6 traffic
@@ -430,19 +429,18 @@ int TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core,
                           ACE_ERROR ((
                               LM_ERROR,
                               ACE_TEXT ("TAO (%P|%t) unable to create ")
-                              ACE_TEXT ("an acceptor for <%s>\n"),
-                              ACE_TEXT_CHAR_TO_TCHAR ((*i)->
-                                protocol_name ().c_str ())
+                              ACE_TEXT ("an acceptor for <%C>\n"),
+                              (*i)->protocol_name ().c_str ()
                             ));
                         }
 
                       return -1;
                     }
 
-                  if (ACE::ipv6_enabled() && 
+                  if (ACE::ipv6_enabled() &&
                       addr.set (port, ACE_IPV6_ANY, 1, AF_INET6) == 0)
                     {
-                      iiop_acceptor = 
+                      iiop_acceptor =
                         dynamic_cast<TAO_IIOP_Acceptor*> (acceptor);
 
                       if (!iiop_acceptor)
@@ -566,8 +564,8 @@ TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core,
           ACE_ERROR ((
               LM_ERROR,
               ACE_TEXT ("TAO (%P|%t) unable to create ")
-              ACE_TEXT ("an acceptor for <%s>\n"),
-              ACE_TEXT_CHAR_TO_TCHAR ((*factory)->protocol_name ().c_str ())
+              ACE_TEXT ("an acceptor for <%C>\n"),
+              (*factory)->protocol_name ().c_str ()
             ));
         }
 
@@ -759,8 +757,8 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core,
                               ACE_ERROR ((
                                   LM_ERROR,
                                   ACE_TEXT ("TAO (%P|%t) unable to create ")
-                                  ACE_TEXT ("an acceptor for <%s>\n"),
-                                  ACE_TEXT_CHAR_TO_TCHAR ((*factory)->protocol_name ().c_str ())
+                                  ACE_TEXT ("an acceptor for <%C>\n"),
+                                  (*factory)->protocol_name ().c_str ()
                                 ));
                             }
 
@@ -853,8 +851,8 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core,
                   ACE_ERROR ((LM_ERROR,
                               ACE_TEXT ("TAO (%P|%t) ")
                               ACE_TEXT ("unable to open acceptor ")
-                              ACE_TEXT ("for <%s>%p\n"),
-                              ACE_TEXT_CHAR_TO_TCHAR (address.c_str ()),
+                              ACE_TEXT ("for <%C>%p\n"),
+                              address.c_str (),
                               ACE_TEXT ("")));
                 }
 
@@ -874,8 +872,8 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core,
             {
               ACE_ERROR ((LM_ERROR,
                           ACE_TEXT ("TAO (%P|%t) unable to create ")
-                          ACE_TEXT ("an acceptor for <%s>.\n"),
-                          ACE_TEXT_CHAR_TO_TCHAR (address.c_str ())));
+                          ACE_TEXT ("an acceptor for <%C>.\n"),
+                          address.c_str ()));
             }
 
           throw ::CORBA::NO_MEMORY (
diff --git a/TAO/tao/AnyTypeCode/NVList.cpp b/TAO/tao/AnyTypeCode/NVList.cpp
index d212179dbdd..25654fa71d1 100644
--- a/TAO/tao/AnyTypeCode/NVList.cpp
+++ b/TAO/tao/AnyTypeCode/NVList.cpp
@@ -333,8 +333,8 @@ CORBA::NVList::_tao_encode (TAO_OutputCDR &cdr, int flag)
                 }
 
               ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("NVList::_tao_encode - parameter <%s>\n"),
-                          ACE_TEXT_CHAR_TO_TCHAR (arg)));
+                          ACE_TEXT ("NVList::_tao_encode - parameter <%C>\n"),
+                          arg));
             }
           CORBA::TypeCode_ptr tc = nv->value ()->_tao_get_typecode ();
           (void) TAO_Marshal_Object::perform_append (tc,
@@ -400,8 +400,8 @@ CORBA::NVList::_tao_decode (TAO_InputCDR &incoming, int flag)
       if (TAO_debug_level > 3)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) : NVList::_tao_decode - %s\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR (nv->name ()? nv->name () : "(no name given)" )));
+                      ACE_TEXT ("TAO (%P|%t) : NVList::_tao_decode - %C\n"),
+                      nv->name ()? nv->name () : "(no name given)" ));
         }
 
       CORBA::Any_ptr any = nv->value ();
diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp
index 9756039cdc2..67fdade8539 100644
--- a/TAO/tao/CORBALOC_Parser.cpp
+++ b/TAO/tao/CORBALOC_Parser.cpp
@@ -166,8 +166,8 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, CORBA::ORB_ptr orb)
         if (TAO_debug_level)
           ACE_ERROR ((LM_ERROR,
                       ACE_TEXT("(%P|%t) TAO_CORBALOC_Parser::parse_string ")
-                      ACE_TEXT("could not parse from %s"),
-                      ACE_TEXT_CHAR_TO_TCHAR(ior)));
+                      ACE_TEXT("could not parse from %C"),
+                      ior));
         throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 10, CORBA::COMPLETED_NO);
       }
     if (*ior == ',') // more endpoints follow
@@ -196,8 +196,8 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, CORBA::ORB_ptr orb)
     if (TAO_debug_level)
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT("(%P|%t) TAO_CORBALOC_Parser::parse_string ")
-                  ACE_TEXT("could not parse from %s"),
-                  ACE_TEXT_CHAR_TO_TCHAR(ior)));
+                  ACE_TEXT("could not parse from %C"),
+                  ior));
     throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 10, CORBA::COMPLETED_NO);
   } // end of while
 
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp
index 36d0e798d78..263b7fd0b09 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp
@@ -86,8 +86,7 @@ TAO::CSD::TP_Strategy_Factory::init (int argc,
                                      arg_remainder.substr (pos + 1, arg.length () - pos);
 
                     // Case-insensitive string comparison.
-                    if (ACE_OS::strcasecmp (ACE_TEXT_CHAR_TO_TCHAR (off_str.c_str()),
-                                            ACE_TEXT("OFF")) == 0)
+                    if (ACE_OS::strcasecmp (off_str.c_str(), "OFF") == 0)
                       {
                         serialize_servants = false;
                       }
diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp
index e913da69b29..d24db801bb3 100644
--- a/TAO/tao/Connector_Registry.cpp
+++ b/TAO/tao/Connector_Registry.cpp
@@ -81,8 +81,8 @@ TAO_Connector_Registry::open (TAO_ORB_Core *orb_core)
              ACE_ERROR_RETURN ((LM_ERROR,
                                 ACE_TEXT ("TAO (%P|%t) - TAO_Connector_Registry")
                                 ACE_TEXT ("::open: unable to open connector for ")
-                                ACE_TEXT ("<%s>.\n"),
-                                ACE_TEXT_CHAR_TO_TCHAR((*factory)->protocol_name ().c_str ())),
+                                ACE_TEXT ("<%C>.\n"),
+                                (*factory)->protocol_name ().c_str ()),
                                -1);
            }
 
diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp
index 15ca449ef40..9e37abb8179 100644
--- a/TAO/tao/Environment.cpp
+++ b/TAO/tao/Environment.cpp
@@ -184,8 +184,8 @@ CORBA::Environment::print_exception (const char *info,
       const char *id = this->exception_->_rep_id ();
 
       ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("TAO: (%P|%t) EXCEPTION, %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (info)));
+                  ACE_TEXT ("TAO: (%P|%t) EXCEPTION, %C\n"),
+                  info));
 
       CORBA::SystemException *x2 =
         CORBA::SystemException::_downcast (this->exception_);
@@ -197,12 +197,12 @@ CORBA::Environment::print_exception (const char *info,
         // held within it ...
 
         ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("TAO: (%P|%t) user exception, ID '%s'\n"),
-                    ACE_TEXT_CHAR_TO_TCHAR (id)));
+                    ACE_TEXT ("TAO: (%P|%t) user exception, ID '%C'\n"),
+                    id));
     }
   else
     ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("TAO: (%P|%t) no exception, %s\n"), ACE_TEXT_CHAR_TO_TCHAR (info)));
+                ACE_TEXT ("TAO: (%P|%t) no exception, %C\n"), info));
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
index fe07331cebb..455c144106c 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -92,10 +92,10 @@ CORBA::Exception::_tao_print_exception (const char *user_provided_info,
                                         FILE *) const
 {
   ACE_ERROR ((LM_ERROR,
-              ACE_TEXT ("(%P|%t) EXCEPTION, %s\n")
-              ACE_TEXT ("%s\n"),
-              ACE_TEXT_CHAR_TO_TCHAR (user_provided_info),
-              ACE_TEXT_CHAR_TO_TCHAR (this->_info ().c_str ())));
+              ACE_TEXT ("(%P|%t) EXCEPTION, %C\n")
+              ACE_TEXT ("%C\n"),
+              user_provided_info,
+              this->_info ().c_str ()));
 }
 
 #if defined (ACE_USES_WCHAR)
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index 119d25664d6..00371b0bb67 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -379,8 +379,8 @@ TAO_IIOP_Acceptor::open (TAO_ORB_Core *orb_core,
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("TAO (%P|%t) - ")
                       ACE_TEXT ("IIOP_Acceptor::open, ")
-                      ACE_TEXT ("Overriding address in IOR with %s\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR (this->hostname_in_ior_)));
+                      ACE_TEXT ("Overriding address in IOR with %C\n"),
+                      this->hostname_in_ior_));
         }
       specified_hostname = this->hostname_in_ior_;
     }
@@ -585,8 +585,8 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr,
         {
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("TAO (%P|%t) - IIOP_Acceptor::open_i, ")
-                      ACE_TEXT ("listening on: <%s:%u>\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR(this->hosts_[i]),
+                      ACE_TEXT ("listening on: <%C:%u>\n"),
+                      this->hosts_[i],
                       this->addrs_[i].get_port_number ()));
         }
     }
@@ -1208,9 +1208,9 @@ TAO_IIOP_Acceptor::parse_options_i (int &argc,
       if (slot == len - 1
           || slot == ACE_CString::npos)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("TAO (%P|%t) - IIOP option <%s> is ")
+                           ACE_TEXT ("TAO (%P|%t) - IIOP option <%C> is ")
                            ACE_TEXT ("missing a value.\n"),
-                           ACE_TEXT_CHAR_TO_TCHAR(argv[i]->c_str ())),
+                           argv[i]->c_str ()),
                           -1);
 
       ACE_CString name = argv[i]->substring (0, slot);
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index e2b082d4d9b..1907687f3a9 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -207,8 +207,8 @@ TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
         {
           ACE_ERROR ((LM_ERROR,
                       ACE_TEXT ("TAO (%P|%t) IIOP_Connector::make_connection, ")
-                      ACE_TEXT("connection to <%s:%d> failed (%p)\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR (iiop_endpoint->host ()),
+                      ACE_TEXT("connection to <%C:%d> failed (%p)\n"),
+                      iiop_endpoint->host (),
                       iiop_endpoint->port (),
                       ACE_TEXT("errno")));
         }
@@ -343,8 +343,8 @@ TAO_IIOP_Connector::begin_connection (TAO_IIOP_Connection_Handler *&svc_handler,
   if (TAO_debug_level > 2)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("TAO (%P|%t) - IIOP_Connector::begin_connection, ")
-                ACE_TEXT ("to <%s:%d> which should %s\n"),
-                ACE_TEXT_CHAR_TO_TCHAR(iiop_endpoint->host()),
+                ACE_TEXT ("to <%C:%d> which should %s\n"),
+                iiop_endpoint->host(),
                 iiop_endpoint->port(),
                 r->blocked_connect () ? ACE_TEXT("block") : ACE_TEXT("nonblock")));
 
@@ -527,8 +527,8 @@ TAO_IIOP_Connector::complete_connection (int result,
             {
               ACE_ERROR ((LM_ERROR,
                           ACE_TEXT ("TAO (%P|%t) - IIOP_Connector::complete_connection,")
-                          ACE_TEXT (" connection to <%s:%d> failed (%p)\n"),
-                          ACE_TEXT_CHAR_TO_TCHAR (ep_list[i]->host ()),
+                          ACE_TEXT (" connection to <%C:%d> failed (%p)\n"),
+                          ep_list[i]->host (),
                           ep_list[i]->port (),
                           ACE_TEXT("errno")));
             }
@@ -566,10 +566,10 @@ TAO_IIOP_Connector::complete_connection (int result,
     {
     ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("TAO (%P|%t) - IIOP_Connector::make_connection, ")
-                  ACE_TEXT ("new %s connection to <%s:%d> on Transport[%d]\n"),
+                  ACE_TEXT ("new %s connection to <%C:%d> on Transport[%d]\n"),
                   transport->is_connected() ?
                   ACE_TEXT("connected") : ACE_TEXT("not connected"),
-                  ACE_TEXT_CHAR_TO_TCHAR (iiop_endpoint->host ()),
+                  iiop_endpoint->host (),
                 iiop_endpoint->port (),
                 svc_handler->peer ().get_handle ()));
     }
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
index 071fb89753e..6427c2659a5 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
@@ -90,8 +90,8 @@ TAO_IORInterceptor_Adapter_Impl::establish_components (TAO_Root_POA* poa)
                 {
                   ACE_DEBUG ((LM_WARNING,
                               "(%P|%t) Exception thrown while processing "
-                              "IORInterceptor \"%s\">\n",
-                              ACE_TEXT_CHAR_TO_TCHAR (name.in ())));
+                              "IORInterceptor \"%C\">\n",
+                              name.in ()));
                 }
 
               ex._tao_print_exception (
diff --git a/TAO/tao/ImR_Client/ImR_Client.cpp b/TAO/tao/ImR_Client/ImR_Client.cpp
index 827532a7019..0657e544195 100644
--- a/TAO/tao/ImR_Client/ImR_Client.cpp
+++ b/TAO/tao/ImR_Client/ImR_Client.cpp
@@ -113,8 +113,8 @@ namespace TAO
 
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
-                    "Informing IMR that we are running at: %s\n",
-                    ACE_TEXT_CHAR_TO_TCHAR (partial_ior.c_str())));
+                    "Informing IMR that we are running at: %C\n",
+                    partial_ior.c_str()));
 
       try
         {
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 8d7dc7b9fe3..7b913d86fae 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -1380,8 +1380,8 @@ TAO_ORB_Core::fini (void)
   if (TAO_debug_level > 2)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("Destroying ORB <%s>\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (this->orbid_)));
+                  ACE_TEXT ("Destroying ORB <%C>\n"),
+                  this->orbid_));
     }
 
   // Finalize lane resources.
@@ -2637,8 +2637,8 @@ TAO_ORB_Core::set_endpoint_helper (const ACE_CString &lane,
     {
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("(%P|%t)\n")
-                  ACE_TEXT ("Invalid endpoint(s) specified:\n%s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR(endpoints.c_str ())));
+                  ACE_TEXT ("Invalid endpoint(s) specified:\n%C\n"),
+                  endpoints.c_str ()));
       throw ::CORBA::BAD_PARAM (
         CORBA::SystemException::_tao_minor_code (
           TAO_ORB_CORE_INIT_LOCATION_CODE,
diff --git a/TAO/tao/Object_Ref_Table.cpp b/TAO/tao/Object_Ref_Table.cpp
index d4c953c27bf..1b5de9392a1 100644
--- a/TAO/tao/Object_Ref_Table.cpp
+++ b/TAO/tao/Object_Ref_Table.cpp
@@ -53,9 +53,9 @@ TAO_Object_Ref_Table::bind (const char *id, CORBA::Object_ptr obj)
           ACE_ERROR ((LM_ERROR,
                       ACE_TEXT ("(%P|%t) Object_Ref_Table::")
                       ACE_TEXT ("bind:")
-                      ACE_TEXT ("  Could not register duplicate object <%s> ")
+                      ACE_TEXT ("  Could not register duplicate object <%C> ")
                       ACE_TEXT ("with the ORB\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR (id)));
+                      id));
         }
 
       return -1;
diff --git a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp
index 280b43c7716..b3924ed60a5 100644
--- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp
+++ b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp
@@ -50,8 +50,8 @@ TAO_Perfect_Hash_OpTable::find (const char *opname,
       skelfunc = 0; // insure that somebody can't call a wrong function!
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("TAO_Perfect_Hash_OpTable:find for ")
-                         ACE_TEXT ("operation '%s' (length=%d) failed\n"),
-                         ACE_TEXT_CHAR_TO_TCHAR (opname ? opname : "<null string>"), length),
+                         ACE_TEXT ("operation '%C' (length=%d) failed\n"),
+                         opname ? opname : "<null string>", length),
                         -1);
     }
 
diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp
index a177c1f1fbf..35fcd1bc7a7 100644
--- a/TAO/tao/PortableServer/Root_POA.cpp
+++ b/TAO/tao/PortableServer/Root_POA.cpp
@@ -1978,8 +1978,8 @@ TAO_Root_POA::key_to_object (const TAO::ObjectKey &key,
 
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
-                    "IMR IOR = \n%s\n",
-                    ACE_TEXT_CHAR_TO_TCHAR (imr_str.in ())));
+                    "IMR IOR = \n%C\n",
+                    imr_str.in ()));
 
       // Search for "corbaloc:" alone, without the protocol.  This code
       // should be protocol neutral.
@@ -2011,8 +2011,8 @@ TAO_Root_POA::key_to_object (const TAO::ObjectKey &key,
 
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
-                    "ImR-ified IOR = \n%s\n",
-                    ACE_TEXT_CHAR_TO_TCHAR (ior.c_str ())));
+                    "ImR-ified IOR = \n%C\n",
+                    ior.c_str ()));
 
       obj = this->orb_core_.orb ()->string_to_object (ior.c_str ());
 
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
index 0335b3fd01b..63f2b2ff519 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
@@ -172,11 +172,11 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
                                                 CORBA::COMPLETED_NO);
 
               ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("(%P|%t): %s processing using %s ")
+                          ACE_TEXT ("(%P|%t): %C processing using %C ")
                           ACE_TEXT ("original thread CORBA/native priority %d/%d ")
                           ACE_TEXT ("not changed\n"),
-                          ACE_TEXT_CHAR_TO_TCHAR (priority_model),
-                          ACE_TEXT_CHAR_TO_TCHAR (thread_pool_id),
+                          priority_model,
+                          thread_pool_id,
                           pre_invoke_state.original_CORBA_priority_,
                           pre_invoke_state.original_native_priority_));
 
@@ -185,11 +185,11 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
     #else /* ACE_HAS_THREADS */
 
               ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("(%P|%t): %s processing using %s ")
+                          ACE_TEXT ("(%P|%t): %C processing using %C ")
                           ACE_TEXT ("original thread CORBA/native priority ")
                           ACE_TEXT ("not changed\n"),
-                          ACE_TEXT_CHAR_TO_TCHAR (priority_model),
-                          ACE_TEXT_CHAR_TO_TCHAR (thread_pool_id)));
+                          priority_model,
+                          thread_pool_id));
 
     #endif /* ACE_HAS_THREADS */
 
@@ -222,11 +222,11 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
                   tph->get_thread_native_priority (native_priority);
 
                   ACE_DEBUG ((LM_DEBUG,
-                              ACE_TEXT ("%s processing using %s ")
+                              ACE_TEXT ("%C processing using %C ")
                               ACE_TEXT ("(%P|%t): original thread CORBA/native priority %d/%d ")
                               ACE_TEXT ("temporarily changed to CORBA/native priority %d/%d\n"),
-                              ACE_TEXT_CHAR_TO_TCHAR (priority_model),
-                              ACE_TEXT_CHAR_TO_TCHAR (thread_pool_id),
+                              priority_model,
+                              thread_pool_id,
                               pre_invoke_state.original_CORBA_priority_,
                               pre_invoke_state.original_native_priority_,
                               target_priority,
@@ -239,11 +239,11 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
               if (TAO_debug_level > 0)
                 {
                   ACE_DEBUG ((LM_DEBUG,
-                              ACE_TEXT ("%s processing using %s ")
+                              ACE_TEXT ("%C processing using %C ")
                               ACE_TEXT ("(%P|%t): original thread CORBA/native priority %d/%d ")
                               ACE_TEXT ("is the same as the target priority\n"),
-                              ACE_TEXT_CHAR_TO_TCHAR (priority_model),
-                              ACE_TEXT_CHAR_TO_TCHAR (thread_pool_id),
+                              priority_model,
+                              thread_pool_id,
                               pre_invoke_state.original_CORBA_priority_,
                               pre_invoke_state.original_native_priority_));
                 }
diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp
index c6a87ee70b6..035a2795693 100644
--- a/TAO/tao/RTScheduling/Request_Interceptor.cpp
+++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp
@@ -186,8 +186,8 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt
 
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
-                    "Received Exception %s\n",
-                    ACE_TEXT_CHAR_TO_TCHAR (id)));
+                    "Received Exception %C\n",
+                    id));
 
       // If the remote host threw a THREAD_CANCELLED
       // exception, make sure to take the appropriate
diff --git a/TAO/tao/Strategies/COIOP_Acceptor.cpp b/TAO/tao/Strategies/COIOP_Acceptor.cpp
index bea8f4e2a54..ffc18b39f90 100644
--- a/TAO/tao/Strategies/COIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/COIOP_Acceptor.cpp
@@ -334,9 +334,9 @@ TAO_COIOP_Acceptor::parse_options (const char *str)
           if (slot == len - 1
               || slot == ACE_CString::npos)
             ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("TAO (%P|%t) COIOP option <%s> is ")
+                               ACE_TEXT ("TAO (%P|%t) COIOP option <%C> is ")
                                ACE_TEXT ("missing a value.\n"),
-                               ACE_TEXT_CHAR_TO_TCHAR (opt.c_str ())),
+                               opt.c_str ()),
                               -1);
 
           ACE_CString name = opt.substring (0, slot);
@@ -360,8 +360,8 @@ TAO_COIOP_Acceptor::parse_options (const char *str)
           else
             {
               ACE_ERROR_RETURN ((LM_ERROR,
-                                 ACE_TEXT ("TAO (%P|%t) Invalid COIOP option: <%s>\n"),
-                                 ACE_TEXT_CHAR_TO_TCHAR (name.c_str ())),
+                                 ACE_TEXT ("TAO (%P|%t) Invalid COIOP option: <%C>\n"),
+                                 name.c_str ()),
                                 -1);
             }
         }
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp
index 4571d1f572c..7cd9fdc1c4f 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp
@@ -456,8 +456,8 @@ TAO_DIOP_Acceptor::open_i (const ACE_INET_Addr& addr,
         {
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("TAO (%P|%t) - DIOP_Acceptor::open_i, ")
-                      ACE_TEXT ("listening on: <%s:%u>\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR (this->hosts_[i]),
+                      ACE_TEXT ("listening on: <%C:%u>\n"),
+                      this->hosts_[i],
                       this->addrs_[i].get_port_number ()));
         }
     }
@@ -1022,9 +1022,9 @@ TAO_DIOP_Acceptor::parse_options (const char *str)
           if (slot == len - 1
               || slot == ACE_CString::npos)
             ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("TAO (%P|%t) - DIOP option <%s> is ")
+                               ACE_TEXT ("TAO (%P|%t) - DIOP option <%C> is ")
                                ACE_TEXT ("missing a value.\n"),
-                               ACE_TEXT_CHAR_TO_TCHAR (opt.c_str ())),
+                               opt.c_str ()),
                               -1);
 
           ACE_CString name = opt.substring (0, slot);
@@ -1048,8 +1048,8 @@ TAO_DIOP_Acceptor::parse_options (const char *str)
           else
             {
               ACE_ERROR_RETURN ((LM_ERROR,
-                                 ACE_TEXT ("TAO (%P|%t) - Invalid DIOP option: <%s>\n"),
-                                 ACE_TEXT_CHAR_TO_TCHAR (name.c_str ())),
+                                 ACE_TEXT ("TAO (%P|%t) - Invalid DIOP option: <%C>\n"),
+                                 name.c_str ()),
                                 -1);
             }
         }
diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
index a4a0bcfca91..102736228ac 100644
--- a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
@@ -143,8 +143,8 @@ TAO_DIOP_Connection_Handler::open (void*)
   {
      ACE_DEBUG ((LM_DEBUG,
                  ACE_TEXT("TAO (%P|%t) - DIOP_Connection_Handler::open, ")
-                 ACE_TEXT("listening on: <%s:%u>\n"),
-                 ACE_TEXT_CHAR_TO_TCHAR (this->local_addr_.get_host_name ()),
+                 ACE_TEXT("listening on: <%C:%u>\n"),
+                 this->local_addr_.get_host_name (),
                  this->local_addr_.get_port_number ()));
   }
 
@@ -203,8 +203,8 @@ TAO_DIOP_Connection_Handler::open_server (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT("TAO (%P|%t) - DIOP_Connection_Handler::open_server, ")
-                  ACE_TEXT("listening on %s:%d\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (this->local_addr_.get_host_name ()),
+                  ACE_TEXT("listening on %C:%d\n"),
+                  this->local_addr_.get_host_name (),
                   this->local_addr_.get_port_number ()
                 ));
     }
diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp
index 15ec920293b..f2c227a73ed 100644
--- a/TAO/tao/Strategies/DIOP_Connector.cpp
+++ b/TAO/tao/Strategies/DIOP_Connector.cpp
@@ -183,8 +183,8 @@ TAO_DIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *,
       if (TAO_debug_level > 3)
         ACE_DEBUG ((LM_ERROR,
                     ACE_TEXT ("TAO (%P|%t) - DIOP_Connector::make_connection, ")
-                    ACE_TEXT ("connection to <%s:%u> failed (%p)\n"),
-                    ACE_TEXT_CHAR_TO_TCHAR (diop_endpoint->host ()),
+                    ACE_TEXT ("connection to <%C:%u> failed (%p)\n"),
+                    diop_endpoint->host (),
                     diop_endpoint->port (),
                     ACE_TEXT ("errno")));
 
diff --git a/TAO/tao/Strategies/DIOP_Transport.cpp b/TAO/tao/Strategies/DIOP_Transport.cpp
index 7d7cee491d8..cb0dc4d9b19 100644
--- a/TAO/tao/Strategies/DIOP_Transport.cpp
+++ b/TAO/tao/Strategies/DIOP_Transport.cpp
@@ -82,9 +82,9 @@ TAO_DIOP_Transport::recv (char *buf,
   if (TAO_debug_level > 0)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - DIOP_Transport::recv, received %d bytes from %s:%d %d\n",
+                  "TAO (%P|%t) - DIOP_Transport::recv, received %d bytes from %C:%d %d\n",
                   n,
-                  ACE_TEXT_CHAR_TO_TCHAR (from_addr.get_host_name ()),
+                  from_addr.get_host_name (),
                   from_addr.get_port_number (),
                   errno));
     }
diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.cpp b/TAO/tao/Strategies/SCIOP_Acceptor.cpp
index 1a2d7c5eaf7..b0c98be4b2c 100644
--- a/TAO/tao/Strategies/SCIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SCIOP_Acceptor.cpp
@@ -607,8 +607,8 @@ TAO_SCIOP_Acceptor::open_i (const ACE_Multihomed_INET_Addr& addr,
         {
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("\nTAO (%P|%t) SCIOP_Acceptor::open_i - ")
-                      ACE_TEXT ("listening on: <%s:%u>\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR(this->hosts_[i]),
+                      ACE_TEXT ("listening on: <%C:%u>\n"),
+                      this->hosts_[i],
                       this->addrs_[i].get_port_number ()));
         }
     }
diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
index 191ac53b3d8..dd3424cb85d 100644
--- a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
@@ -320,9 +320,9 @@ TAO_SCIOP_Connection_Handler::process_listen_point_list (
       if (TAO_debug_level > 0)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT("(%P|%t) Listening port [%d] on [%s]\n"),
+                      ACE_TEXT("(%P|%t) Listening port [%d] on [%C]\n"),
                       listen_point.port,
-                      ACE_TEXT_CHAR_TO_TCHAR(listen_point.host.in ())));
+                      listen_point.host.in ()));
         }
 
       // Construct an  SCIOP_Endpoint object
diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp
index c28b24bb4f7..73403b215a1 100644
--- a/TAO/tao/Strategies/SCIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connector.cpp
@@ -157,9 +157,9 @@ TAO_SCIOP_Connector::make_connection_i (TAO::Profile_Transport_Resolver *r,
 
   if (TAO_debug_level > 2)
       ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - SCIOP_Connector::make_connection_i, "
-                  "to <%s:%d> which should %s\n",
-                  ACE_TEXT_CHAR_TO_TCHAR(sciop_endpoint->host()),
+                  ACE_TEXT("TAO (%P|%t) - SCIOP_Connector::make_connection_i, ")
+                  ACE_TEXT("to <%C:%d> which should %s\n"),
+                  sciop_endpoint->host(),
                   sciop_endpoint->port(),
                   r->blocked_connect () ? ACE_TEXT("block") : ACE_TEXT("nonblock")));
 
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
index 7df047f5c15..6a117d233a3 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
@@ -330,8 +330,8 @@ TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core, ACE_Reactor *reactor)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("TAO (%P|%t) - SHMIOP_Acceptor::open_i, ")
-                  ACE_TEXT ("listening on : <%s:%u>\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR(this->host_.c_str ()),
+                  ACE_TEXT ("listening on : <%C:%u>\n"),
+                  this->host_.c_str (),
                   this->address_.get_port_number ()));
     }
 
@@ -468,9 +468,9 @@ TAO_SHMIOP_Acceptor::parse_options (const char *str)
           if (slot == len - 1
               || slot == ACE_CString::npos)
             ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("TAO (%P|%t) SHMIOP option <%s> is ")
+                               ACE_TEXT ("TAO (%P|%t) SHMIOP option <%C> is ")
                                ACE_TEXT ("missing a value.\n"),
-                               ACE_TEXT_CHAR_TO_TCHAR(opt.c_str ())),
+                               opt.c_str ()),
                               -1);
 
           ACE_CString name = opt.substring (0, slot);
@@ -493,8 +493,8 @@ TAO_SHMIOP_Acceptor::parse_options (const char *str)
             }
           else
             ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("TAO (%P|%t) Invalid SHMIOP option: <%s>\n"),
-                               ACE_TEXT_CHAR_TO_TCHAR(name.c_str ())),
+                               ACE_TEXT ("TAO (%P|%t) Invalid SHMIOP option: <%C>\n"),
+                               name.c_str ()),
                               -1);
         }
       else
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp
index 3246460473a..5e8aed3cf36 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp
@@ -143,8 +143,8 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *,
   if (TAO_debug_level > 2)
     ACE_DEBUG ((LM_DEBUG,
                 "TAO (%P|%t) - SHMIOP_Connector::make_connection, "
-                "making a new connection to <%s:%d>\n",
-                ACE_TEXT_CHAR_TO_TCHAR (shmiop_endpoint->host ()),
+                "making a new connection to <%C:%d>\n",
+                shmiop_endpoint->host (),
                 shmiop_endpoint->port ()));
 
   // Get the right synch options
@@ -179,8 +179,8 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *,
         {
           ACE_ERROR ((LM_ERROR,
                       ACE_TEXT ("TAO (%P|%t) - SHMIOP_Connector::make_connection, ")
-                      ACE_TEXT ("connection to <%s:%u> failed (%p)\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR (shmiop_endpoint->host ()),
+                      ACE_TEXT ("connection to <%C:%u> failed (%p)\n"),
+                      shmiop_endpoint->host (),
                       shmiop_endpoint->port (),
                       ACE_TEXT ("errno")));
         }
@@ -206,9 +206,9 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *,
   if (TAO_debug_level > 2)
     ACE_DEBUG ((LM_DEBUG,
                 "TAO (%P|%t) - SHMIOP_Connector::make_connection, "
-                "new %s connection to <%s:%d> on Transport[%d]\n",
+                "new %C connection to <%C:%d> on Transport[%d]\n",
                 transport->is_connected() ? "connected" : "not connected",
-                ACE_TEXT_CHAR_TO_TCHAR (shmiop_endpoint->host ()),
+                shmiop_endpoint->host (),
                 shmiop_endpoint->port (),
                 svc_handler->peer ().get_handle ()));
 
diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp
index 0e55594a19c..fcb473a3351 100644
--- a/TAO/tao/Strategies/advanced_resource.cpp
+++ b/TAO/tao/Strategies/advanced_resource.cpp
@@ -392,16 +392,16 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT("TAO (%P|%t) Unable to load ")
-                             ACE_TEXT("protocol <%s>, %m\n"),
-                             ACE_TEXT_CHAR_TO_TCHAR(name.c_str ())),
+                             ACE_TEXT("protocol <%C>, %m\n"),
+                             name.c_str ()),
                             -1);
         }
 
       if (TAO_debug_level > 0)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT("TAO (%P|%t) Loaded protocol <%s>\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR(name.c_str ())));
+                      ACE_TEXT("TAO (%P|%t) Loaded protocol <%C>\n"),
+                      name.c_str ()));
         }
     }
  return 0;
diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp
index 334f17b0762..41346a896e0 100644
--- a/TAO/tao/Synch_Invocation.cpp
+++ b/TAO/tao/Synch_Invocation.cpp
@@ -488,8 +488,8 @@ namespace TAO
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("TAO (%P|%t) - Synch_Twoway_Invocation::")
                     ACE_TEXT ("handle_user_exception - ")
-                    ACE_TEXT ("raising exception %s\n"),
-                    ACE_TEXT_CHAR_TO_TCHAR (buf.in ())));
+                    ACE_TEXT ("raising exception %C\n"),
+                    buf.in ()));
       }
 
     mon.set_status (TAO_INVOKE_USER_EXCEPTION);
diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp
index db2cf2fbb35..5fc8374524d 100644
--- a/TAO/tao/SystemException.cpp
+++ b/TAO/tao/SystemException.cpp
@@ -220,8 +220,8 @@ void
 CORBA::SystemException::_tao_print_system_exception (FILE *) const
 {
   ACE_ERROR ((LM_ERROR,
-              ACE_TEXT("(%P|%t) system exception, ID '%s'\n"),
-              ACE_TEXT_CHAR_TO_TCHAR (this->_info ().c_str ())));
+              ACE_TEXT("(%P|%t) system exception, ID '%C'\n"),
+              this->_info ().c_str ()));
 }
 
 ACE_CString
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index 4356e0efe27..30af71ca9e3 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -59,9 +59,9 @@ dump_iov (iovec *iov, int iovcnt, size_t id,
   ACE_Guard <ACE_Log_Msg> log_guard (*ACE_Log_Msg::instance ());
 
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("TAO (%P|%t) - Transport[%d]::%s, ")
+              ACE_TEXT ("TAO (%P|%t) - Transport[%d]::%C, ")
               ACE_TEXT ("sending %d buffers\n"),
-              id, ACE_TEXT_CHAR_TO_TCHAR (location), iovcnt));
+              id, location, iovcnt));
 
   for (int i = 0; i != iovcnt && 0 < current_transfer; ++i)
     {
@@ -74,9 +74,9 @@ dump_iov (iovec *iov, int iovcnt, size_t id,
         }
 
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - Transport[%d]::%s, ")
+                  ACE_TEXT ("TAO (%P|%t) - Transport[%d]::%C, ")
                   ACE_TEXT ("buffer %d/%d has %d bytes\n"),
-                  id, ACE_TEXT_CHAR_TO_TCHAR(location),
+                  id, location,
                   i, iovcnt,
                   iov_len));
 
@@ -111,9 +111,9 @@ dump_iov (iovec *iov, int iovcnt, size_t id,
     }
 
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("TAO (%P|%t) - Transport[%d]::%s, ")
+              ACE_TEXT ("TAO (%P|%t) - Transport[%d]::%C, ")
               ACE_TEXT ("end of data\n"),
-              id, ACE_TEXT_CHAR_TO_TCHAR(location)));
+              id, location));
 }
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -1255,8 +1255,8 @@ TAO_Transport::report_invalid_event_handler (const char *caller)
     {
       ACE_DEBUG ((LM_DEBUG,
          ACE_TEXT ("TAO (%P|%t) - Transport[%d]::report_invalid_event_handler")
-         ACE_TEXT ("(%s) no longer associated with handler [tag=%d]\n"),
-         this->id (), ACE_TEXT_CHAR_TO_TCHAR (caller), this->tag_));
+         ACE_TEXT ("(%C) no longer associated with handler [tag=%d]\n"),
+         this->id (), caller, this->tag_));
     }
 }
 
diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp
index 467419213d9..413b0a7df77 100644
--- a/TAO/tao/Transport_Connector.cpp
+++ b/TAO/tao/Transport_Connector.cpp
@@ -134,8 +134,8 @@ TAO_Connector::make_mprofile (const char *string, TAO_MProfile &mprofile)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("TAO (%P|%t) - TAO_Connector::make_mprofile ")
-                  ACE_TEXT ("<%s>\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (string)));
+                  ACE_TEXT ("<%C>\n"),
+                  string));
     }
 
   ACE_CString ior;
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index 8d8830ce8bc..d6d7d07f27c 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -733,8 +733,8 @@ TAO_Default_Resource_Factory::init_protocol_factories (void)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("TAO (%P|%t) Unable to load ")
-                             ACE_TEXT ("protocol <%s>, %p\n"),
-                             ACE_TEXT_CHAR_TO_TCHAR(name.c_str ()),
+                             ACE_TEXT ("protocol <%C>, %p\n"),
+                             name.c_str (),
                              ACE_TEXT ("")),
                             -1);
         }
@@ -742,8 +742,8 @@ TAO_Default_Resource_Factory::init_protocol_factories (void)
       if (TAO_debug_level > 0)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) Loaded protocol <%s>\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR(name.c_str ())));
+                      ACE_TEXT ("TAO (%P|%t) Loaded protocol <%C>\n"),
+                      name.c_str ()));
         }
     }