Tue Jul 31 18:14:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

1 files changed, 19 insertions, 19 deletions

diff --git a/ACE/ace/Naming_Context.cpp b/ACE/ace/Naming_Context.cpp
index 8d0c03c2ef0..47076fc7f6e 100644
--- a/ACE/ace/Naming_Context.cpp
+++ b/ACE/ace/Naming_Context.cpp
@@ -35,9 +35,9 @@ ACE_Naming_Context::info (ACE_TCHAR **strp,
   ACE_TCHAR buf[BUFSIZ];
 
   ACE_OS::sprintf (buf,
-                   ACE_LIB_TEXT ("%s\t#%s\n"),
-                   ACE_LIB_TEXT ("ACE_Naming_Context"),
-                   ACE_LIB_TEXT ("Proxy for making calls to a Name Server"));
+                   ACE_TEXT ("%s\t#%s\n"),
+                   ACE_TEXT ("ACE_Naming_Context"),
+                   ACE_TEXT ("Proxy for making calls to a Name Server"));
 
   if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
     return -1;
@@ -51,7 +51,7 @@ ACE_Naming_Context::local (void)
 {
   ACE_TRACE ("ACE_Naming_Context::local");
   return ACE_OS::strcmp (this->netnameserver_host_,
-                         ACE_LIB_TEXT ("localhost")) == 0
+                         ACE_TEXT ("localhost")) == 0
     || ACE_OS::strcmp (this->netnameserver_host_,
                        this->hostname_) == 0;
 }
@@ -105,7 +105,7 @@ ACE_Naming_Context::open (Context_Scope_Type scope_in, int lite)
 
   if (ACE_LOG_MSG->op_status () != 0 || this->name_space_ == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_LIB_TEXT ("NAME_SPACE::NAME_SPACE\n")),
+                       ACE_TEXT ("NAME_SPACE::NAME_SPACE\n")),
                       -1);
   return 0;
 }
@@ -156,8 +156,8 @@ ACE_Naming_Context::ACE_Naming_Context (Context_Scope_Type scope_in,
   // Initialize.
   if (this->open (scope_in, lite) == -1)
     ACE_ERROR ((LM_ERROR,
-                ACE_LIB_TEXT ("%p\n"),
-                ACE_LIB_TEXT ("ACE_Naming_Context::ACE_Naming_Context")));
+                ACE_TEXT ("%p\n"),
+                ACE_TEXT ("ACE_Naming_Context::ACE_Naming_Context")));
 }
 
 ACE_Name_Options *
@@ -393,7 +393,7 @@ ACE_Naming_Context::init (int argc, ACE_TCHAR *argv[])
 {
   if (ACE::debug ())
     ACE_DEBUG ((LM_DEBUG,
-                ACE_LIB_TEXT ("ACE_Naming_Context::init\n")));
+                ACE_TEXT ("ACE_Naming_Context::init\n")));
   this->name_options_->parse_args (argc, argv);
   return this->open (this->name_options_->context ());
 }
@@ -403,7 +403,7 @@ ACE_Naming_Context::fini (void)
 {
   if (ACE::debug ())
     ACE_DEBUG ((LM_DEBUG,
-                ACE_LIB_TEXT ("ACE_Naming_Context::fini\n")));
+                ACE_TEXT ("ACE_Naming_Context::fini\n")));
   this->close_down ();
   return 0;
 }
@@ -429,9 +429,9 @@ ACE_Name_Options::ACE_Name_Options (void)
   if (ACE::get_temp_dir (this->namespace_dir_, MAXPATHLEN) == -1)
     {
       ACE_ERROR ((LM_ERROR,
-                  ACE_LIB_TEXT ("Temporary path too long, ")
-                  ACE_LIB_TEXT ("defaulting to current directory\n")));
-      ACE_OS::strcpy (this->namespace_dir_, ACE_LIB_TEXT ("."));
+                  ACE_TEXT ("Temporary path too long, ")
+                  ACE_TEXT ("defaulting to current directory\n")));
+      ACE_OS::strcpy (this->namespace_dir_, ACE_TEXT ("."));
       ACE_OS::strcat (this->namespace_dir_, ACE_DIRECTORY_SEPARATOR_STR);
     }
 #endif /* ACE_DEFAULT_NAMESPACE_DIR */
@@ -600,18 +600,18 @@ ACE_Name_Options::parse_args (int argc, ACE_TCHAR *argv[])
   // clean it up in the destructor).
   this->database (this->process_name ());
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_LIB_TEXT ("b:c:dh:l:P:p:s:T:vr"));
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("b:c:dh:l:P:p:s:T:vr"));
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
       {
       case 'c':
         {
-          if (ACE_OS::strcmp (get_opt.opt_arg (), ACE_LIB_TEXT ("PROC_LOCAL")) == 0)
+          if (ACE_OS::strcmp (get_opt.opt_arg (), ACE_TEXT ("PROC_LOCAL")) == 0)
             this->context (ACE_Naming_Context::PROC_LOCAL);
-          else if (ACE_OS::strcmp (get_opt.opt_arg (), ACE_LIB_TEXT ("NODE_LOCAL")) == 0)
+          else if (ACE_OS::strcmp (get_opt.opt_arg (), ACE_TEXT ("NODE_LOCAL")) == 0)
             this->context (ACE_Naming_Context::NODE_LOCAL);
-          else if (ACE_OS::strcmp (get_opt.opt_arg (), ACE_LIB_TEXT ("NET_LOCAL")) == 0)
+          else if (ACE_OS::strcmp (get_opt.opt_arg (), ACE_TEXT ("NET_LOCAL")) == 0)
             this->context (ACE_Naming_Context::NET_LOCAL);
         }
         break;
@@ -642,9 +642,9 @@ ACE_Name_Options::parse_args (int argc, ACE_TCHAR *argv[])
         break;
       case 'T':
 #if defined (ACE_HAS_TRACE)
-        if (ACE_OS::strcasecmp (get_opt.opt_arg (), ACE_LIB_TEXT ("ON")) == 0)
+        if (ACE_OS::strcasecmp (get_opt.opt_arg (), ACE_TEXT ("ON")) == 0)
           ACE_Trace::start_tracing ();
-        else if (ACE_OS::strcasecmp (get_opt.opt_arg (), ACE_LIB_TEXT ("OFF")) == 0)
+        else if (ACE_OS::strcasecmp (get_opt.opt_arg (), ACE_TEXT ("OFF")) == 0)
           ACE_Trace::stop_tracing ();
 #endif /* ACE_HAS_TRACE */
         break;
@@ -676,7 +676,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 
 ACE_FACTORY_DEFINE (ACE, ACE_Naming_Context)
 ACE_STATIC_SVC_DEFINE (ACE_Naming_Context,
-                       ACE_LIB_TEXT ("ACE_Naming_Context"),
+                       ACE_TEXT ("ACE_Naming_Context"),
                        ACE_SVC_OBJ_T,
                        &ACE_SVC_NAME (ACE_Naming_Context),
                        ACE_Service_Type::DELETE_THIS |