ChangeLogTag:Tue Apr 2 13:41:38 UTC 2002 Don Hinton <dhinton@ieee.org>

4 files changed, 51 insertions, 40 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index a10a55a91c0..920d5f4e3f8 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,12 @@
+Tue Apr  2 13:41:38 UTC 2002  Don Hinton <dhinton@ieee.org>
+
+	* tao/Acceptor_Registry.cpp:
+	* tao/Connector_Registry.cpp:
+	* tao/default_resource.cpp:
+	  Wrapped calls to ACE_CString::c_str() in ACE_TEXT_CHAR_TO_TCHAR,
+	  changed ACE_TEXT to ACE_LIB_TEXT, and added missing ACE_LIB_TEXT 
+	  in ACE_DEBUG/ACE_ERROR calls.
+
 Mon Apr  1 18:05:22 2002  Jaiganesh Balasubramanian  <jai@doc.ece.uci.edu>
 
 	* orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp:
diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp
index 459b46d23a5..cb263dd55c6 100644
--- a/TAO/tao/Acceptor_Registry.cpp
+++ b/TAO/tao/Acceptor_Registry.cpp
@@ -111,7 +111,7 @@ int
 TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
                              ACE_Reactor *reactor,
                              int ignore_address
-                             ACE_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // protocol_factories is in the following form
@@ -154,9 +154,9 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
         {
           if (TAO_debug_level > 0)
             ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("(%P|%t) Invalid endpoint specification: ")
-                        ACE_TEXT ("<%s>.\n"),
-                        iop.c_str ()));
+                        ACE_LIB_TEXT ("(%P|%t) Invalid endpoint specification: ")
+                        ACE_LIB_TEXT ("<%s>.\n"),
+                        ACE_TEXT_CHAR_TO_TCHAR(iop.c_str ())));
 
           ACE_THROW_RETURN (CORBA::BAD_PARAM (
               CORBA_SystemException::_tao_minor_code (
@@ -211,9 +211,9 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
         {
           if (TAO_debug_level > 0)
             ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("(%P|%t) Invalid endpoint specification: ")
-                        ACE_TEXT ("<%s>.\n"),
-                        iop.c_str ()));
+                        ACE_LIB_TEXT ("(%P|%t) Invalid endpoint specification: ")
+                        ACE_LIB_TEXT ("<%s>.\n"),
+                        ACE_TEXT_CHAR_TO_TCHAR(iop.c_str ())));
 
           ACE_THROW_RETURN (CORBA::BAD_PARAM (
               CORBA_SystemException::_tao_minor_code (
@@ -268,9 +268,9 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
       if (found == 0)
         {
           ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("TAO (%P|%t) ")
-                      ACE_TEXT ("no usable transport protocol ")
-                      ACE_TEXT ("was found.\n")));
+                      ACE_LIB_TEXT ("TAO (%P|%t) ")
+                      ACE_LIB_TEXT ("no usable transport protocol ")
+                      ACE_LIB_TEXT ("was found.\n")));
 
           ACE_THROW_RETURN (CORBA::BAD_PARAM (
               CORBA_SystemException::_tao_minor_code (
@@ -341,10 +341,10 @@ int TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core,
       if (TAO_debug_level > 0)
         {
           ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("TAO (%P|%t) No default endpoints ")
-                      ACE_TEXT ("opened.\n")
-                      ACE_TEXT ("Please specify one or more using ")
-                      ACE_TEXT ("the \"-ORBEndpoint\" option.\n")));
+                      ACE_LIB_TEXT ("TAO (%P|%t) No default endpoints ")
+                      ACE_LIB_TEXT ("opened.\n")
+                      ACE_LIB_TEXT ("Please specify one or more using ")
+                      ACE_LIB_TEXT ("the \"-ORBEndpoint\" option.\n")));
         }
 
       return -1;
@@ -374,9 +374,9 @@ TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core,
     {
       if (TAO_debug_level > 0)
         ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("TAO (%P|%t) unable to create ")
-                    ACE_TEXT ("an acceptor for <%s>\n"),
-                    (*factory)->protocol_name ().c_str ()));
+                    ACE_LIB_TEXT ("TAO (%P|%t) unable to create ")
+                    ACE_LIB_TEXT ("an acceptor for <%s>\n"),
+                    ACE_TEXT_CHAR_TO_TCHAR((*factory)->protocol_name ().c_str ())));
 
       return -1;
     }
@@ -392,9 +392,10 @@ TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core,
 
       if (TAO_debug_level > 0)
         ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("TAO (%P|%t) unable to open ")
-                    ACE_TEXT ("default acceptor for <%s>%p\n"),
-                    (*factory)->protocol_name ().c_str (), ""));
+                    ACE_LIB_TEXT ("TAO (%P|%t) unable to open ")
+                    ACE_LIB_TEXT ("default acceptor for <%s>%p\n"),
+                    ACE_TEXT_CHAR_TO_TCHAR((*factory)->protocol_name ().c_str ()),
+                    ACE_LIB_TEXT ("")));
 
       return -1;
     }
@@ -474,7 +475,7 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core,
                                ACE_CString &addrs,
                                TAO_ProtocolFactorySetItor &factory,
                                int ignore_address
-                               ACE_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   ACE_CString options_tmp;
   this->extract_endpoint_options (addrs,
@@ -552,11 +553,11 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core,
 
               if (TAO_debug_level > 0)
                 ACE_ERROR ((LM_ERROR,
-                            ACE_TEXT ("TAO (%P|%t) ")
-                            ACE_TEXT ("unable to open acceptor ")
-                            ACE_TEXT ("for <%s>%p\n"),
-                            address.c_str (),
-                            ""));
+                            ACE_LIB_TEXT ("TAO (%P|%t) ")
+                            ACE_LIB_TEXT ("unable to open acceptor ")
+                            ACE_LIB_TEXT ("for <%s>%p\n"),
+                            ACE_TEXT_CHAR_TO_TCHAR(address.c_str ()),
+                            ACE_LIB_TEXT ("")));
 
               ACE_THROW_RETURN (CORBA::BAD_PARAM (
                   CORBA_SystemException::_tao_minor_code (
@@ -573,9 +574,9 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core,
         {
           if (TAO_debug_level > 0)
             ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("TAO (%P|%t) unable to create ")
-                        ACE_TEXT ("an acceptor for <%s>.\n"),
-                        address.c_str ()));
+                        ACE_LIB_TEXT ("TAO (%P|%t) unable to create ")
+                        ACE_LIB_TEXT ("an acceptor for <%s>.\n"),
+                        ACE_TEXT_CHAR_TO_TCHAR(address.c_str ())));
 
           ACE_THROW_RETURN (CORBA::NO_MEMORY (
               CORBA_SystemException::_tao_minor_code (
diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp
index eb9107f7dcf..3570475cff3 100644
--- a/TAO/tao/Connector_Registry.cpp
+++ b/TAO/tao/Connector_Registry.cpp
@@ -85,9 +85,9 @@ TAO_Connector_Registry::open (TAO_ORB_Core *orb_core)
               delete connector;
 
               ACE_ERROR_RETURN ((LM_ERROR,
-                                 ACE_TEXT ("TAO (%P|%t) unable to open connector for ")
-                                 ACE_TEXT ("<%s>.\n"),
-                                 (*factory)->protocol_name ().c_str ()),
+                                 ACE_LIB_TEXT ("TAO (%P|%t) unable to open connector for ")
+                                 ACE_LIB_TEXT ("<%s>.\n"),
+                                 ACE_TEXT_CHAR_TO_TCHAR((*factory)->protocol_name ().c_str ())),
                                 -1);
             }
 
@@ -132,7 +132,7 @@ TAO_Connector_Registry::preconnect (TAO_ORB_Core *orb_core,
     {
       if (TAO_debug_level > 0)
         ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("TAO (%P|%t) Unable to preprocess the preconnections.\n")));
+                    ACE_LIB_TEXT ("TAO (%P|%t) Unable to preprocess the preconnections.\n")));
 
       return -1;
     }
@@ -358,7 +358,7 @@ TAO_Connector_Registry::create_profile (TAO_InputCDR &cdr)
       if (TAO_debug_level > 0)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) Unknown profile tag 0x%x\n"),
+                      ACE_LIB_TEXT ("TAO (%P|%t) Unknown profile tag 0x%x\n"),
                       tag));
         }
 
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index ba4fe40c6ed..7bc5ebe37a6 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -355,15 +355,15 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[])
         // Can we assume there is an argument after the option?
         // curarg++;
         ACE_ERROR ((LM_ERROR,
-                    "Default_Resource_Factory - "
-                    "unknown option <%s>\n",
+                    ACE_LIB_TEXT ("Default_Resource_Factory - ")
+                    ACE_LIB_TEXT ("unknown option <%s>\n"),
                     argv[curarg]));
       }
     else
       {
         ACE_DEBUG ((LM_DEBUG,
-                    "Default_Resource_Factory - "
-                    "ignoring option <%s>\n",
+                    ACE_LIB_TEXT ("Default_Resource_Factory - ")
+                    ACE_LIB_TEXT ("ignoring option <%s>\n"),
                     argv[curarg]));
       }
 
@@ -511,7 +511,7 @@ TAO_Default_Resource_Factory::load_default_protocols (void)
           ACE_ERROR ((LM_ERROR,
                       ACE_LIB_TEXT ("TAO (%P|%t) Unable to add ")
                       ACE_LIB_TEXT ("<%s> to protocol factory set.\n"),
-                      item->protocol_name ().c_str ()));
+                      ACE_TEXT_CHAR_TO_TCHAR (item->protocol_name ().c_str ())));
 
           delete item;
 
@@ -552,7 +552,8 @@ TAO_Default_Resource_Factory::init_protocol_factories (void)
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_LIB_TEXT ("TAO (%P|%t) Unable to load ")
                              ACE_LIB_TEXT ("protocol <%s>, %p\n"),
-                             ACE_TEXT_CHAR_TO_TCHAR(name.c_str ()), ""),
+                             ACE_TEXT_CHAR_TO_TCHAR(name.c_str ()), 
+                             ACE_LIB_TEXT ("")),
                             -1);
         }