ChangeLogTag: Fri Jun 18 14:29:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>

1 files changed, 36 insertions, 36 deletions

diff --git a/TAO/tao/Codeset_Manager.cpp b/TAO/tao/Codeset_Manager.cpp
index 6ab711ac37d..9e16803c470 100644
--- a/TAO/tao/Codeset_Manager.cpp
+++ b/TAO/tao/Codeset_Manager.cpp
@@ -98,8 +98,8 @@ TAO_Codeset_Manager::set_tcs (TAO_Profile &theProfile,
       if(TAO_debug_level > 2)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_LIB_TEXT ("TAO (%P|%t) - Codeset_Manager::set_tcs, ")
-                      ACE_LIB_TEXT ("transport already set\n")));
+                      ACE_TEXT ("TAO (%P|%t) - Codeset_Manager::set_tcs, ")
+                      ACE_TEXT ("transport already set\n")));
         }
 
       return;
@@ -115,8 +115,8 @@ TAO_Codeset_Manager::set_tcs (TAO_Profile &theProfile,
       if (TAO_debug_level > 2)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_LIB_TEXT ("TAO (%P|%t) - Codeset_Manager::set_tcs, ")
-                      ACE_LIB_TEXT ("No codeset component in profile\n")));
+                      ACE_TEXT ("TAO (%P|%t) - Codeset_Manager::set_tcs, ")
+                      ACE_TEXT ("No codeset component in profile\n")));
         }
 
       remote.ForCharData.native_code_set =
@@ -131,8 +131,8 @@ TAO_Codeset_Manager::set_tcs (TAO_Profile &theProfile,
                      this->codeset_info_.ForCharData);
        if (TAO_debug_level > 2)
          ACE_DEBUG ((LM_DEBUG,
-                     ACE_LIB_TEXT("TAO (%P|%t) -  Codeset_Manager::set_tcs ")
-                     ACE_LIB_TEXT("setting char translator(%08x)\n"),
+                     ACE_TEXT("TAO (%P|%t) -  Codeset_Manager::set_tcs ")
+                     ACE_TEXT("setting char translator(%08x)\n"),
                      tcs));
        trans.char_translator(this->get_char_trans (tcs));
 
@@ -141,8 +141,8 @@ TAO_Codeset_Manager::set_tcs (TAO_Profile &theProfile,
 
        if (TAO_debug_level > 2)
          ACE_DEBUG ((LM_DEBUG,
-                     ACE_LIB_TEXT("TAO (%P|%t) - Codeset_Manager::set_tcs ")
-                     ACE_LIB_TEXT("setting wchar translator (%08x)\n"),
+                     ACE_TEXT("TAO (%P|%t) - Codeset_Manager::set_tcs ")
+                     ACE_TEXT("setting wchar translator (%08x)\n"),
                      tcs));
        trans.wchar_translator(this->get_wchar_trans (tcs));
      }
@@ -184,15 +184,15 @@ TAO_Codeset_Manager::process_service_context (TAO_ServerRequest &request)
     {
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_LIB_TEXT("TAO (%P|%t) - Codeset_Manager::process_service_context ")
-                    ACE_LIB_TEXT("no codeset context in request, inferring TAO backwards compatibility\n")));
+                    ACE_TEXT("TAO (%P|%t) - Codeset_Manager::process_service_context ")
+                    ACE_TEXT("no codeset context in request, inferring TAO backwards compatibility\n")));
     }
   if (TAO_debug_level > 2)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_LIB_TEXT ("TAO (%P|%t) - Codeset_Manager::")
-                  ACE_LIB_TEXT ("process_service_context, ")
-                  ACE_LIB_TEXT ("using tcsc = %08x, tcsw = %08x\n"),
+                  ACE_TEXT ("TAO (%P|%t) - Codeset_Manager::")
+                  ACE_TEXT ("process_service_context, ")
+                  ACE_TEXT ("using tcsc = %08x, tcsw = %08x\n"),
                   tcs_c,tcs_w));
     }
 
@@ -222,9 +222,9 @@ TAO_Codeset_Manager::generate_service_context (TAO_Operation_Details &opd,
   if (TAO_debug_level > 2)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_LIB_TEXT ("TAO (%P|%t) - Codeset_Manager::")
-                  ACE_LIB_TEXT ("generate_service_context, ")
-                  ACE_LIB_TEXT ("using tcs_c = %08x, tcs_w = %08x\n"),
+                  ACE_TEXT ("TAO (%P|%t) - Codeset_Manager::")
+                  ACE_TEXT ("generate_service_context, ")
+                  ACE_TEXT ("using tcs_c = %08x, tcs_w = %08x\n"),
                   codeset_cntx.char_data,
                   codeset_cntx.wchar_data));
     }
@@ -338,10 +338,10 @@ TAO_Codeset_Manager::add_char_translator (const char *name)
   if (this->char_factories_.insert (item) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_LIB_TEXT ("TAO (%P|%t) - Codeset_Manager::")
-                         ACE_LIB_TEXT ("add_char_translator, ")
-                         ACE_LIB_TEXT ("Unable to add Codeset ")
-                         ACE_LIB_TEXT ("factories for %s: %m\n"),
+                         ACE_TEXT ("TAO (%P|%t) - Codeset_Manager::")
+                         ACE_TEXT ("add_char_translator, ")
+                         ACE_TEXT ("Unable to add Codeset ")
+                         ACE_TEXT ("factories for %s: %m\n"),
                          ACE_TEXT_CHAR_TO_TCHAR (name)),
                         -1);
     }
@@ -358,10 +358,10 @@ TAO_Codeset_Manager::add_wchar_translator (const char *name)
   if (this->wchar_factories_.insert (item) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_LIB_TEXT ("TAO (%P|%t) - Codeset_Manager::")
-                         ACE_LIB_TEXT ("add_wchar_translator, ")
-                         ACE_LIB_TEXT ("Unable to add Codeset ")
-                         ACE_LIB_TEXT ("factories for %s: %m\n"),
+                         ACE_TEXT ("TAO (%P|%t) - Codeset_Manager::")
+                         ACE_TEXT ("add_wchar_translator, ")
+                         ACE_TEXT ("Unable to add Codeset ")
+                         ACE_TEXT ("factories for %s: %m\n"),
                          ACE_TEXT_CHAR_TO_TCHAR (name)),
                         -1);
     }
@@ -376,18 +376,18 @@ TAO_Codeset_Manager::configure_codeset_factories()
                                 this->codeset_info_.ForCharData) == -1)
     {
       ACE_ERROR ((LM_ERROR,
-                  ACE_LIB_TEXT ("TAO (%P|%t) - Codeset_Manager::")
-                  ACE_LIB_TEXT ("configure_codeset_factories, failed to init ")
-                  ACE_LIB_TEXT ("char codeset factories\n")));
+                  ACE_TEXT ("TAO (%P|%t) - Codeset_Manager::")
+                  ACE_TEXT ("configure_codeset_factories, failed to init ")
+                  ACE_TEXT ("char codeset factories\n")));
     }
 
   if (init_codeset_factories_i (this->wchar_factories_,
                                 this->codeset_info_.ForWcharData) == -1)
     {
       ACE_ERROR ((LM_ERROR,
-                  ACE_LIB_TEXT ("TAO (%P|%t) - Codeset_Manager::")
-                  ACE_LIB_TEXT ("configure_codeset_factories, failed to init ")
-                  ACE_LIB_TEXT ("wchar codeset factories\n")));
+                  ACE_TEXT ("TAO (%P|%t) - Codeset_Manager::")
+                  ACE_TEXT ("configure_codeset_factories, failed to init ")
+                  ACE_TEXT ("wchar codeset factories\n")));
     }
 
   if (this->codeset_info_.ForWcharData.native_code_set == 0)
@@ -420,9 +420,9 @@ TAO_Codeset_Manager::init_codeset_factories_i (
       if (trans == 0)
         {
           ACE_ERROR ((LM_ERROR,
-                      ACE_LIB_TEXT ("TAO (%P|%t) - Codeset_Manager::")
-                      ACE_LIB_TEXT ("init_codeset_factories_i, Unable to load ")
-                      ACE_LIB_TEXT ("CodeSet <%s>, %m\n"),
+                      ACE_TEXT ("TAO (%P|%t) - Codeset_Manager::")
+                      ACE_TEXT ("init_codeset_factories_i, Unable to load ")
+                      ACE_TEXT ("CodeSet <%s>, %m\n"),
                       ACE_TEXT_CHAR_TO_TCHAR(name)));
           continue;
         }
@@ -435,9 +435,9 @@ TAO_Codeset_Manager::init_codeset_factories_i (
           if (TAO_debug_level > 2)
             {
               ACE_DEBUG ((LM_DEBUG,
-                          ACE_LIB_TEXT ("TAO (%P|%t) - Codeset_Manager::")
-                          ACE_LIB_TEXT ("init_codeset_factories_i, Loaded CodeSet ")
-                          ACE_LIB_TEXT ("<%s>, ncs = %08x tcs = %08x\n"),
+                          ACE_TEXT ("TAO (%P|%t) - Codeset_Manager::")
+                          ACE_TEXT ("init_codeset_factories_i, Loaded CodeSet ")
+                          ACE_TEXT ("<%s>, ncs = %08x tcs = %08x\n"),
                           ACE_TEXT_CHAR_TO_TCHAR(name),
                           trans->ncs(),trans->tcs()));
             }