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

1 files changed, 47 insertions, 47 deletions

diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp
index 500fdda3388..42e52eb00c4 100644
--- a/TAO/tao/default_server.cpp
+++ b/TAO/tao/default_server.cpp
@@ -70,7 +70,7 @@ TAO_Default_Server_Strategy_Factory::server_connection_thread_count (void)
 // Evil macros b/c I'm lazy!
 #define TAO_BEGINCHECK  if (0)
 #define TAO_CHECKANDSET(sym) \
-  else if (ACE_OS::strcmp (const_cast <const ACE_TCHAR *> ( flag), ACE_LIB_TEXT(#sym)) == 0) \
+  else if (ACE_OS::strcmp (const_cast <const ACE_TCHAR *> ( flag), ACE_TEXT(#sym)) == 0) \
   ACE_SET_BITS (this->thread_flags_, sym)
 #define TAO_ENDCHECK
 
@@ -80,11 +80,11 @@ TAO_Default_Server_Strategy_Factory::tokenize (ACE_TCHAR* flag_string)
   ACE_TCHAR* lasts = 0;
 
   for (ACE_TCHAR* flag = ACE_OS::strtok_r (flag_string,
-                                      ACE_LIB_TEXT("|"),
+                                      ACE_TEXT("|"),
                                       &lasts);
        flag != 0;
        flag = ACE_OS::strtok_r (0,
-                                ACE_LIB_TEXT("|"),
+                                ACE_TEXT("|"),
                                 &lasts))
     {
       TAO_BEGINCHECK;
@@ -120,7 +120,7 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
 
   for (curarg = 0; curarg < argc && argv[curarg]; ++curarg)
     if (ACE_OS::strcasecmp (argv[curarg],
-                            ACE_LIB_TEXT("-ORBConcurrency")) == 0)
+                            ACE_TEXT("-ORBConcurrency")) == 0)
       {
         ++curarg;
         if (curarg < argc)
@@ -128,18 +128,18 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
             ACE_TCHAR* name = argv[curarg];
 
             if (ACE_OS::strcasecmp (name,
-                                    ACE_LIB_TEXT("reactive")) == 0)
+                                    ACE_TEXT("reactive")) == 0)
               this->activate_server_connections_ = 0;
             else if (ACE_OS::strcasecmp (name,
-                                         ACE_LIB_TEXT("thread-per-connection")) == 0)
+                                         ACE_TEXT("thread-per-connection")) == 0)
               this->activate_server_connections_ = 1;
             else
-              this->report_option_value_error (ACE_LIB_TEXT("-ORBConcurrency"), name);
+              this->report_option_value_error (ACE_TEXT("-ORBConcurrency"), name);
           }
       }
 
     else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_LIB_TEXT("-ORBThreadPerConnectionTimeout")) == 0)
+                                 ACE_TEXT("-ORBThreadPerConnectionTimeout")) == 0)
       {
         ++curarg;
         if (curarg < argc)
@@ -147,7 +147,7 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
             ACE_TCHAR* name = argv[curarg];
 
             if (ACE_OS::strcasecmp (name,
-                                    ACE_LIB_TEXT("infinite")) == 0)
+                                    ACE_TEXT("infinite")) == 0)
               {
                 this->thread_per_connection_use_timeout_ = 0;
               }
@@ -162,9 +162,9 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
       }
 
     else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_LIB_TEXT("-ORBTableSize")) == 0
+                                 ACE_TEXT("-ORBTableSize")) == 0
              || ACE_OS::strcasecmp (argv[curarg],
-                                    ACE_LIB_TEXT("-ORBActiveObjectMapSize")) == 0)
+                                    ACE_TEXT("-ORBActiveObjectMapSize")) == 0)
       {
         ++curarg;
         if (curarg < argc)
@@ -174,7 +174,7 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
                              10);
       }
     else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_LIB_TEXT("-ORBPOAMapSize")) == 0)
+                                 ACE_TEXT("-ORBPOAMapSize")) == 0)
       {
         ++curarg;
         if (curarg < argc)
@@ -184,7 +184,7 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
                              10);
       }
     else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_LIB_TEXT("-ORBActiveHintInIds")) == 0)
+                                 ACE_TEXT("-ORBActiveHintInIds")) == 0)
       {
         ++curarg;
         if (curarg < argc)
@@ -196,7 +196,7 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
           }
       }
     else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_LIB_TEXT("-ORBActiveHintInPOANames")) == 0)
+                                 ACE_TEXT("-ORBActiveHintInPOANames")) == 0)
       {
         ++curarg;
         if (curarg < argc)
@@ -208,7 +208,7 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
           }
       }
     else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_LIB_TEXT("-ORBAllowReactivationOfSystemids")) == 0)
+                                 ACE_TEXT("-ORBAllowReactivationOfSystemids")) == 0)
       {
         ++curarg;
         if (curarg < argc)
@@ -220,7 +220,7 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
           }
       }
     else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_LIB_TEXT("-ORBUseridPolicyDemuxStrategy")) == 0)
+                                 ACE_TEXT("-ORBUseridPolicyDemuxStrategy")) == 0)
       {
         ++curarg;
         if (curarg < argc)
@@ -229,19 +229,19 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
 
             // Active demux not supported with user id policy.
             if (ACE_OS::strcasecmp (name,
-                                    ACE_LIB_TEXT("dynamic")) == 0)
+                                    ACE_TEXT("dynamic")) == 0)
               this->active_object_map_creation_parameters_.object_lookup_strategy_for_user_id_policy_ =
                 TAO_DYNAMIC_HASH;
             else if (ACE_OS::strcasecmp (name,
-                                         ACE_LIB_TEXT("linear")) == 0)
+                                         ACE_TEXT("linear")) == 0)
               this->active_object_map_creation_parameters_.object_lookup_strategy_for_user_id_policy_ =
                 TAO_LINEAR;
             else
-              this->report_option_value_error (ACE_LIB_TEXT("-ORBUseridPolicyDemuxStrategy"), name);
+              this->report_option_value_error (ACE_TEXT("-ORBUseridPolicyDemuxStrategy"), name);
           }
       }
     else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_LIB_TEXT("-ORBSystemidPolicyDemuxStrategy")) == 0)
+                                 ACE_TEXT("-ORBSystemidPolicyDemuxStrategy")) == 0)
       {
         ++curarg;
         if (curarg < argc)
@@ -249,23 +249,23 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
             ACE_TCHAR* name = argv[curarg];
 
             if (ACE_OS::strcasecmp (name,
-                                    ACE_LIB_TEXT("dynamic")) == 0)
+                                    ACE_TEXT("dynamic")) == 0)
               this->active_object_map_creation_parameters_.object_lookup_strategy_for_system_id_policy_ =
                 TAO_DYNAMIC_HASH;
             else if (ACE_OS::strcasecmp (name,
-                                         ACE_LIB_TEXT("linear")) == 0)
+                                         ACE_TEXT("linear")) == 0)
               this->active_object_map_creation_parameters_.object_lookup_strategy_for_system_id_policy_ =
                 TAO_LINEAR;
             else if (ACE_OS::strcasecmp (name,
-                                         ACE_LIB_TEXT("active")) == 0)
+                                         ACE_TEXT("active")) == 0)
               this->active_object_map_creation_parameters_.object_lookup_strategy_for_system_id_policy_ =
                 TAO_ACTIVE_DEMUX;
             else
-              this->report_option_value_error (ACE_LIB_TEXT("-ORBSystemidPolicyDemuxStrategy"), name);
+              this->report_option_value_error (ACE_TEXT("-ORBSystemidPolicyDemuxStrategy"), name);
           }
       }
     else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_LIB_TEXT("-ORBPersistentidPolicyDemuxStrategy")) == 0)
+                                 ACE_TEXT("-ORBPersistentidPolicyDemuxStrategy")) == 0)
       {
         ++curarg;
         if (curarg < argc)
@@ -274,19 +274,19 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
 
             // Active demux not supported with user id policy.
             if (ACE_OS::strcasecmp (name,
-                                    ACE_LIB_TEXT("dynamic")) == 0)
+                                    ACE_TEXT("dynamic")) == 0)
               this->active_object_map_creation_parameters_.poa_lookup_strategy_for_persistent_id_policy_ =
                 TAO_DYNAMIC_HASH;
             else if (ACE_OS::strcasecmp (name,
-                                         ACE_LIB_TEXT("linear")) == 0)
+                                         ACE_TEXT("linear")) == 0)
               this->active_object_map_creation_parameters_.poa_lookup_strategy_for_persistent_id_policy_ =
                 TAO_LINEAR;
             else
-              this->report_option_value_error (ACE_LIB_TEXT("-ORBPersistentidPolicyDemuxStrategy"), name);
+              this->report_option_value_error (ACE_TEXT("-ORBPersistentidPolicyDemuxStrategy"), name);
           }
       }
     else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_LIB_TEXT("-ORBTransientidPolicyDemuxStrategy")) == 0)
+                                 ACE_TEXT("-ORBTransientidPolicyDemuxStrategy")) == 0)
       {
         ++curarg;
         if (curarg < argc)
@@ -294,23 +294,23 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
             ACE_TCHAR* name = argv[curarg];
 
             if (ACE_OS::strcasecmp (name,
-                                    ACE_LIB_TEXT("dynamic")) == 0)
+                                    ACE_TEXT("dynamic")) == 0)
               this->active_object_map_creation_parameters_.poa_lookup_strategy_for_transient_id_policy_ =
                 TAO_DYNAMIC_HASH;
             else if (ACE_OS::strcasecmp (name,
-                                         ACE_LIB_TEXT("linear")) == 0)
+                                         ACE_TEXT("linear")) == 0)
               this->active_object_map_creation_parameters_.poa_lookup_strategy_for_transient_id_policy_ =
                 TAO_LINEAR;
             else if (ACE_OS::strcasecmp (name,
-                                         ACE_LIB_TEXT("active")) == 0)
+                                         ACE_TEXT("active")) == 0)
               this->active_object_map_creation_parameters_.poa_lookup_strategy_for_transient_id_policy_ =
                 TAO_ACTIVE_DEMUX;
             else
-              this->report_option_value_error (ACE_LIB_TEXT("-ORBTransientidPolicyDemuxStrategy"), name);
+              this->report_option_value_error (ACE_TEXT("-ORBTransientidPolicyDemuxStrategy"), name);
           }
       }
     else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_LIB_TEXT("-ORBUniqueidPolicyReverseDemuxStrategy")) == 0)
+                                 ACE_TEXT("-ORBUniqueidPolicyReverseDemuxStrategy")) == 0)
       {
         ++curarg;
         if (curarg < argc)
@@ -318,19 +318,19 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
             ACE_TCHAR* name = argv[curarg];
 
             if (ACE_OS::strcasecmp (name,
-                                    ACE_LIB_TEXT("dynamic")) == 0)
+                                    ACE_TEXT("dynamic")) == 0)
               this->active_object_map_creation_parameters_.reverse_object_lookup_strategy_for_unique_id_policy_ =
                 TAO_DYNAMIC_HASH;
             else if (ACE_OS::strcasecmp (name,
-                                         ACE_LIB_TEXT("linear")) == 0)
+                                         ACE_TEXT("linear")) == 0)
               this->active_object_map_creation_parameters_.reverse_object_lookup_strategy_for_unique_id_policy_ =
                 TAO_LINEAR;
             else
-              this->report_option_value_error (ACE_LIB_TEXT("-ORBUniqueidPolicyReverseDemuxStrategy"), name);
+              this->report_option_value_error (ACE_TEXT("-ORBUniqueidPolicyReverseDemuxStrategy"), name);
           }
       }
     else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_LIB_TEXT("-ORBPOALock")) == 0)
+                                 ACE_TEXT("-ORBPOALock")) == 0)
       {
         ++curarg;
         if (curarg < argc)
@@ -338,17 +338,17 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
             ACE_TCHAR* name = argv[curarg];
 
             if (ACE_OS::strcasecmp (name,
-                                    ACE_LIB_TEXT("thread")) == 0)
+                                    ACE_TEXT("thread")) == 0)
               this->poa_lock_type_ = TAO_THREAD_LOCK;
             else if (ACE_OS::strcasecmp (name,
-                                         ACE_LIB_TEXT("null")) == 0)
+                                         ACE_TEXT("null")) == 0)
               this->poa_lock_type_ = TAO_NULL_LOCK;
             else
-              this->report_option_value_error (ACE_LIB_TEXT("-ORBPOALock"), name);
+              this->report_option_value_error (ACE_TEXT("-ORBPOALock"), name);
           }
       }
     else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_LIB_TEXT("-ORBThreadFlags")) == 0)
+                                 ACE_TEXT("-ORBThreadFlags")) == 0)
       {
         ++curarg;
 
@@ -356,20 +356,20 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
           this->tokenize (argv[curarg]);
       }
 
-    else if (ACE_OS::strncmp (argv[curarg], ACE_LIB_TEXT("-ORB"), 4) == 0)
+    else if (ACE_OS::strncmp (argv[curarg], ACE_TEXT("-ORB"), 4) == 0)
       {
         // Can we assume there is an argument after the option?
         // ++curarg;
         ACE_ERROR ((LM_ERROR,
-                    ACE_LIB_TEXT("Server_Strategy_Factory - ")
-                    ACE_LIB_TEXT("unknown option <%s>\n"),
+                    ACE_TEXT("Server_Strategy_Factory - ")
+                    ACE_TEXT("unknown option <%s>\n"),
                     argv[curarg]));
       }
     else
       {
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_LIB_TEXT("Server_Strategy_Factory - ")
-                    ACE_LIB_TEXT("ignoring option <%s>\n"),
+                    ACE_TEXT("Server_Strategy_Factory - ")
+                    ACE_TEXT("ignoring option <%s>\n"),
                     argv[curarg]));
       }