Thu Apr 11 18:03:24 UTC 2013 Huang-Ming Huang <huangh@ociweb.com>

26 files changed, 48 insertions, 48 deletions

diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp
index 815bdf3dc6a..6197d346b35 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.cpp
+++ b/TAO/tao/PortableServer/Active_Object_Map.cpp
@@ -118,7 +118,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (
                         TAO_Multiple_Id_Strategy,
                         CORBA::NO_MEMORY ());
 #else
-      ACE_ERROR ((LM_ERROR,
+      TAOLIB_ERROR ((LM_ERROR,
                   "Multiple Id Strategy not supported with CORBA/e\n"));
 #endif
     }
@@ -137,7 +137,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (
                         CORBA::NO_MEMORY ());
 #else
       ACE_UNUSED_ARG (persistent_id_policy);
-      ACE_ERROR ((LM_ERROR,
+      TAOLIB_ERROR ((LM_ERROR,
                   "Persistent Id Strategy not supported with CORBA/e\n"));
 #endif
     }
@@ -160,7 +160,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (
                         TAO_User_Id_Strategy,
                         CORBA::NO_MEMORY ());
 #else
-      ACE_ERROR ((LM_ERROR,
+      TAOLIB_ERROR ((LM_ERROR,
                   "User Id Assignment not supported with CORBA/e\n"));
 #endif
     }
@@ -177,7 +177,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (
                         TAO_System_Id_With_Multiple_Id_Strategy,
                         CORBA::NO_MEMORY ());
 #else
-      ACE_ERROR ((LM_ERROR,
+      TAOLIB_ERROR ((LM_ERROR,
                   "System Id Assignment with multiple "
                   "not supported with CORBA/e\n"));
 #endif
@@ -222,7 +222,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (
                             CORBA::NO_MEMORY ());
           break;
 #else
-          ACE_ERROR ((LM_ERROR,
+          TAOLIB_ERROR ((LM_ERROR,
                       "linear option for "
                       "-ORBUniqueidPolicyReverseDemuxStrategy "
                       "not supported with minimum POA maps. "
@@ -257,7 +257,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (
                             CORBA::NO_MEMORY ());
           break;
 #else
-          ACE_ERROR ((LM_ERROR,
+          TAOLIB_ERROR ((LM_ERROR,
                       "linear option for -ORBUseridPolicyDemuxStrategy "
                       "not supported with minimum POA maps. "
                       "Ingoring option to use default...\n"));
@@ -291,7 +291,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (
 #else
         case TAO_LINEAR:
         case TAO_DYNAMIC_HASH:
-          ACE_ERROR ((LM_ERROR,
+          TAOLIB_ERROR ((LM_ERROR,
                       "linear and dynamic options for -ORBSystemidPolicyDemuxStrategy "
                       "are not supported with minimum POA maps. "
                       "Ingoring option to use default...\n"));
@@ -514,7 +514,7 @@ TAO_Unique_Id_Strategy::bind_using_user_id (
       ACE_CString hex_idstr;
       hexstring (hex_idstr, idstr.in (), user_id.length ());
 
-      ACE_DEBUG ((LM_DEBUG,
+      TAOLIB_DEBUG ((LM_DEBUG,
                   "TAO (%P|%t) - TAO_Unique_Id_Strategy::"
                   "bind_using_user_id: type=%C, id=%C\n",
                   repository_id.in (),
@@ -542,7 +542,7 @@ TAO_Unique_Id_Strategy::unbind_using_user_id (
           ACE_CString hex_idstr;
           hexstring (hex_idstr, idstr.in (), entry->user_id_.length ());
 
-          ACE_DEBUG ((LM_DEBUG,
+          TAOLIB_DEBUG ((LM_DEBUG,
                       "TAO (%P|%t) - TAO_Unique_Id_Strategy::unbind_using_user_id: id=%C\n",
                       hex_idstr.c_str()
                       ));
@@ -711,7 +711,7 @@ TAO_Multiple_Id_Strategy::bind_using_user_id (
       ACE_CString hex_idstr;
       hexstring (hex_idstr, idstr.in (), user_id.length ());
 
-      ACE_DEBUG ((LM_DEBUG,
+      TAOLIB_DEBUG ((LM_DEBUG,
                   "TAO (%P|%t) - TAO_Multiple_Id_Strategy::"
                   "bind_using_user_id: type=%C, id=%C\n",
                   repository_id.in (),
@@ -739,7 +739,7 @@ TAO_Multiple_Id_Strategy::unbind_using_user_id (
           ACE_CString hex_idstr;
           hexstring (hex_idstr, idstr.in (), entry->user_id_.length ());
 
-          ACE_DEBUG ((LM_DEBUG,
+          TAOLIB_DEBUG ((LM_DEBUG,
                       "TAO (%P|%t) - TAO_Multiple_Id_Strategy::unbind_using_user_id: id=%C\n",
                       hex_idstr.c_str()
                       ));
@@ -1011,7 +1011,7 @@ TAO_System_Id_With_Unique_Id_Strategy::bind_using_system_id (
       ACE_CString hex_idstr;
       hexstring (hex_idstr, idstr.in (), entry->user_id_.length ());
 
-      ACE_DEBUG ((LM_DEBUG,
+      TAOLIB_DEBUG ((LM_DEBUG,
                   "TAO (%P|%t) - TAO_System_Id_With_Unique_Id_Strategy::"
                   "bind_using_system_id: type=%C, id=%C\n",
                   repository_id.in (),
@@ -1069,7 +1069,7 @@ TAO_System_Id_With_Multiple_Id_Strategy::bind_using_system_id (
       ACE_CString hex_idstr;
       hexstring (hex_idstr, idstr.in (), entry->user_id_.length ());
 
-      ACE_DEBUG ((LM_DEBUG,
+      TAOLIB_DEBUG ((LM_DEBUG,
                   "TAO (%P|%t) - TAO_System_Id_With_Multiple_Id_Strategy::"
                   "bind_using_system_id: type=%C, id=%C\n",
                   repository_id.in (),
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp
index 64125e36789..0e35e72667f 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp
@@ -35,7 +35,7 @@ namespace TAO
         ACE_Dynamic_Service <IdAssignmentStrategy>::instance (strategy_name);
 
       if (strategy == 0)
-        ACE_ERROR ((LM_ERROR,
+        TAOLIB_ERROR ((LM_ERROR,
                    ACE_TEXT ("(%P|%t) ERROR, Unable to get %s\n"),
                    strategy_name));
 
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp
index 550b416663b..20d16cf497b 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp
@@ -23,7 +23,7 @@ namespace TAO
             ACE_Dynamic_Service<IdUniquenessStrategy>::instance ("IdUniquenessStrategyMultiple");
 
           if (strategy == 0)
-            ACE_ERROR ((LM_ERROR,
+            TAOLIB_ERROR ((LM_ERROR,
                         ACE_TEXT ("(%P|%t) %p\n"),
                         ACE_TEXT ("ERROR, Unable to get ")
                         ACE_TEXT ("IdUniquenessStrategyMultiple")));
@@ -38,7 +38,7 @@ namespace TAO
           if (strategy_factory != 0)
             strategy = strategy_factory->create (value);
           else
-            ACE_ERROR ((LM_ERROR,
+            TAOLIB_ERROR ((LM_ERROR,
                         ACE_TEXT ("(%P|%t) %p\n"),
                         ACE_TEXT ("ERROR, Unable to get ")
                         ACE_TEXT ("IdUniquenessStrategyUniqueFactory")));
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp
index cf426d70b8b..884b5b7157e 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp
@@ -25,7 +25,7 @@ namespace TAO
         }
         case ::PortableServer::MULTIPLE_ID :
         {
-          ACE_ERROR ((LM_ERROR, "Incorrect type in IdUniquenessStrategyUniqueFactoryImpl"));
+          TAOLIB_ERROR ((LM_ERROR, "Incorrect type in IdUniquenessStrategyUniqueFactoryImpl"));
           break;
         }
       }
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
index 9a41f2b1915..0ad1d25ed95 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
@@ -37,7 +37,7 @@ namespace TAO
         ACE_Dynamic_Service<ImplicitActivationStrategy>::instance (strategy_name);
 
       if (strategy == 0)
-        ACE_ERROR ((LM_ERROR,
+        TAOLIB_ERROR ((LM_ERROR,
                     ACE_TEXT ("(%P|%t) ERROR, Unable to get %s\n"),
                     strategy_name));
 
diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
index e859a50587f..cba6cc54506 100644
--- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
@@ -37,7 +37,7 @@ namespace TAO
       if (strategy_factory != 0)
         strategy = strategy_factory->create (value);
       else
-        ACE_ERROR ((LM_ERROR,
+        TAOLIB_ERROR ((LM_ERROR,
                     ACE_TEXT ("(%P|%t) ERROR, Unable to get %s\n"),
                     strategy_name));
 
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
index 0c82a670673..bbf189d97f2 100644
--- a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
@@ -97,7 +97,7 @@ namespace TAO
               // When we don't have a ImR_Client adapter, but the user
               // has specified that the ImR has to be used we have an
               // error situation which has to be reported.
-              ACE_ERROR ((LM_ERROR,
+              TAOLIB_ERROR ((LM_ERROR,
                           ACE_TEXT ("(%P|%t) ERROR: No ImR_Client library ")
                           ACE_TEXT ("available but use IMR has been specified.\n")));
 
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
index 349374e809f..21c978c7dec 100644
--- a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
@@ -26,7 +26,7 @@ namespace TAO
         }
         case ::PortableServer::TRANSIENT :
         {
-          ACE_ERROR ((LM_ERROR, "Incorrect type in LifespanStrategyPersistentFactoryImpl"));
+          TAOLIB_ERROR ((LM_ERROR, "Incorrect type in LifespanStrategyPersistentFactoryImpl"));
           break;
         }
       }
diff --git a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
index d51455af87d..f95bd64abbe 100644
--- a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
@@ -21,7 +21,7 @@ namespace TAO
       {
         case ::PortableServer::PERSISTENT :
         {
-          ACE_ERROR ((LM_ERROR, "Incorrect type in LifespanStrategyTransientFactoryImpl"));
+          TAOLIB_ERROR ((LM_ERROR, "Incorrect type in LifespanStrategyTransientFactoryImpl"));
           break;
         }
         case ::PortableServer::TRANSIENT :
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index 3b4940e3f6f..315d6d19c9f 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -182,7 +182,7 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ
 
       break;
 #else
-      ACE_ERROR ((LM_ERROR,
+      TAOLIB_ERROR ((LM_ERROR,
                   "linear option for -ORBPersistentidPolicyDemuxStrategy "
                   "not supported with minimum POA maps. "
                   "Ingoring option to use default...\n"));
@@ -212,7 +212,7 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ
 #else
     case TAO_LINEAR:
     case TAO_DYNAMIC_HASH:
-      ACE_ERROR ((LM_ERROR,
+      TAOLIB_ERROR ((LM_ERROR,
                   "linear and dynamic options for -ORBTransientidPolicyDemuxStrategy "
                   "are not supported with minimum POA maps. "
                   "Ingoring option to use default...\n"));
@@ -1176,7 +1176,7 @@ TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete_no_throw (void)
     }
   catch (const ::CORBA::Exception&)
     {
-      ACE_ERROR ((LM_ERROR,
+      TAOLIB_ERROR ((LM_ERROR,
                   "TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete "
                   "threw exception it should not have!\n"));
     }
diff --git a/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp b/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp
index 29e37c7bda2..e03cc272ccd 100644
--- a/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp
+++ b/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp
@@ -42,7 +42,7 @@ TAO_Binary_Search_OpTable::find (const char *opname,
   TAO_operation_db_entry const * const entry = lookup (opname);
 
   if (entry == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    TAOLIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("TAO_Binary_Search_Table:find failed\n")),
                       -1);
   // Valid entry. Figure out the skel_ptr.
@@ -62,7 +62,7 @@ TAO_Binary_Search_OpTable::find (const char *opname,
   TAO_operation_db_entry const * const entry = lookup (opname);
 
   if (entry == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    TAOLIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("TAO_Binary_Search_Table:find failed\n")),
                       -1);
 
diff --git a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp
index 918c6f5e765..6674ec34112 100644
--- a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp
+++ b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp
@@ -46,7 +46,7 @@ TAO_Dynamic_Hash_OpTable::TAO_Dynamic_Hash_OpTable (
 
       // @@ (ASG): what happens if bind fails ???
       if (this->bind (db[i].opname, s) == -1)
-        ACE_ERROR ((LM_ERROR,
+        TAOLIB_ERROR ((LM_ERROR,
                     ACE_TEXT ("(%P|%t) %p\n"),
                     ACE_TEXT ("bind failed")));
     }
diff --git a/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp b/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp
index 95739497b67..7f74c9b14b0 100644
--- a/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp
+++ b/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp
@@ -49,7 +49,7 @@ TAO_Linear_Search_OpTable::find (const char *opname,
 
   TAO_operation_db_entry const * const entry = lookup (opname);
   if (entry == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    TAOLIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("TAO_Linear_Search_Table:find failed\n")),
                       -1);
 
@@ -70,7 +70,7 @@ TAO_Linear_Search_OpTable::find (const char *opname,
 
   TAO_operation_db_entry const * const entry = lookup (opname);
   if (entry == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    TAOLIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("TAO_Linear_Search_Table:find failed\n")),
                       -1);
 
diff --git a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp
index 53444157d75..8bda68e2ab6 100644
--- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp
+++ b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp
@@ -44,7 +44,7 @@ TAO_Perfect_Hash_OpTable::find (const char *opname,
   if (entry == 0)
     {
       skelfunc = 0; // insure that somebody can't call a wrong function!
-      ACE_ERROR_RETURN ((LM_ERROR,
+      TAOLIB_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("TAO_Perfect_Hash_OpTable:find for ")
                          ACE_TEXT ("operation '%C' (length=%d) failed\n"),
                          opname ? opname : "<null string>", length),
@@ -69,7 +69,7 @@ TAO_Perfect_Hash_OpTable::find (const char *opname,
   if (entry == 0)
     {
       skelfunc = 0; // insure that somebody can't call a wrong function!
-      ACE_ERROR_RETURN ((LM_ERROR,
+      TAOLIB_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("TAO_Perfect_Hash_OpTable:find for ")
                          ACE_TEXT ("operation '%C' (length=%d) failed\n"),
                          opname ? opname : "<null string>", length),
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.cpp b/TAO/tao/PortableServer/POA_Policy_Set.cpp
index 03bff4ef0f1..18c8aa44eff 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.cpp
+++ b/TAO/tao/PortableServer/POA_Policy_Set.cpp
@@ -78,7 +78,7 @@ TAO_POA_Policy_Set::validate_policies (TAO_Policy_Validator &validator,
           // it.
           throw PortableServer::POA::InvalidPolicy ();
 #else
-          ACE_ERROR ((LM_ERROR, "Invalid policy\n"));
+          TAOLIB_ERROR ((LM_ERROR, "Invalid policy\n"));
 #endif
         }
     }
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp
index 75be8246496..2926b1c345e 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp
@@ -29,7 +29,7 @@ namespace TAO
         }
         default :
         {
-          ACE_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyAOMOnlyFactoryImpl"));
+          TAOLIB_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyAOMOnlyFactoryImpl"));
           break;
         }
       }
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp
index 42f778c5e21..37de98b0d91 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp
@@ -32,7 +32,7 @@ namespace TAO
         }
         default :
         {
-          ACE_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyDefaultServantFactoryImpl"));
+          TAOLIB_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyDefaultServantFactoryImpl"));
           break;
         }
       }
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp
index dbaadb81a5d..58fc42ee29d 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp
@@ -66,7 +66,7 @@ namespace TAO
       if (strategy_factory != 0)
         strategy = strategy_factory->create (value, srvalue);
       else
-        ACE_ERROR ((LM_ERROR,
+        TAOLIB_ERROR ((LM_ERROR,
                     ACE_TEXT ("(%P|%t) %p\n"),
                     ACE_TEXT ("ERROR, Unable to get ")
                     ACE_TEXT ("RequestProcessingStrategyFactory")));
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp
index 89ade874fbc..243c668dbf1 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp
@@ -36,7 +36,7 @@ namespace TAO
             }
             case ::PortableServer::NON_RETAIN :
             {
-              ACE_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyServantActivatorFactoryImpl"));
+              TAOLIB_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyServantActivatorFactoryImpl"));
               break;
             }
           }
@@ -44,7 +44,7 @@ namespace TAO
         }
         default :
         {
-          ACE_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyServantActivatorFactoryImpl"));
+          TAOLIB_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyServantActivatorFactoryImpl"));
           break;
         }
       }
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
index f2b2c9bc23d..10fe91d4753 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
@@ -32,7 +32,7 @@ namespace TAO
           {
             case ::PortableServer::RETAIN :
             {
-              ACE_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyServantLocatorFactoryImpl"));
+              TAOLIB_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyServantLocatorFactoryImpl"));
               break;
             }
             case ::PortableServer::NON_RETAIN :
@@ -45,7 +45,7 @@ namespace TAO
         }
         default :
         {
-          ACE_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyServantLocatorFactoryImpl"));
+          TAOLIB_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyServantLocatorFactoryImpl"));
           break;
         }
       }
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
index e203b22a0fa..ebf256b0a4f 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
@@ -40,7 +40,7 @@ namespace TAO
       if (strategy_factory == 0)
         {
           if (TAO_debug_level > 1)
-            ACE_ERROR ((LM_ERROR,
+            TAOLIB_ERROR ((LM_ERROR,
                         ACE_TEXT ("(%P|%t) ERROR, Unable to get %s\n"),
                         strategy_factory_name));
 
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
index e9284dd771b..bc00bd2f036 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
@@ -31,7 +31,7 @@ namespace TAO
         }
         case ::PortableServer::RETAIN :
         {
-          ACE_ERROR ((LM_ERROR, "Incorrect type in ServantRetentionStrategyNonRetainFactoryImpl"));
+          TAOLIB_ERROR ((LM_ERROR, "Incorrect type in ServantRetentionStrategyNonRetainFactoryImpl"));
           break;
         }
       }
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
index 503131137db..f8aa128e6c0 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
@@ -364,7 +364,7 @@ namespace TAO
           if (deactivated)
             {
               if (TAO_debug_level > 0)
-                ACE_DEBUG ((LM_DEBUG,
+                TAOLIB_DEBUG ((LM_DEBUG,
                             ACE_TEXT ("(%t) TAO_Root_POA::is_servant_in_map: waiting for servant to deactivate\n")));
 
               // We are going to wait on this condition variable; the POA
@@ -411,7 +411,7 @@ namespace TAO
           if (deactivated)
             {
               if (TAO_debug_level > 0)
-                ACE_DEBUG ((LM_DEBUG,
+                TAOLIB_DEBUG ((LM_DEBUG,
                             ACE_TEXT ("(%t) TAO_Root_POA::is_user_id_in_map: waiting for servant to deactivate\n")));
 
               // We are going to wait on this condition variable; the POA
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp
index a453de132ef..b530d045063 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp
@@ -28,7 +28,7 @@ namespace TAO
         }
         case ::PortableServer::NON_RETAIN :
         {
-          ACE_ERROR ((LM_ERROR, "Incorrect type in ServantRetentionStrategyNonRetainFactoryImpl"));
+          TAOLIB_ERROR ((LM_ERROR, "Incorrect type in ServantRetentionStrategyNonRetainFactoryImpl"));
           break;
         }
       }
diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp
index b9fe653988b..c9281b877e7 100644
--- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp
@@ -27,7 +27,7 @@ namespace TAO
           if (strategy_factory != 0)
             strategy = strategy_factory->create (value);
           else
-            ACE_ERROR ((LM_ERROR,
+            TAOLIB_ERROR ((LM_ERROR,
                         ACE_TEXT ("(%P|%t) %p\n"),
                         ACE_TEXT ("ERROR, Unable to get ")
                         ACE_TEXT ("ThreadStrategySingleFactory")));
@@ -40,7 +40,7 @@ namespace TAO
             ACE_Dynamic_Service<ThreadStrategy>::instance ("ThreadStrategyORBControl");
 
           if (strategy == 0)
-            ACE_ERROR ((LM_ERROR,
+            TAOLIB_ERROR ((LM_ERROR,
                         ACE_TEXT ("(%P|%t) %p\n"),
                         ACE_TEXT ("ERROR, Unable to get ")
                         ACE_TEXT ("ThreadStrategyORBControl")));
diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
index 8967b90a273..28ee4688c2d 100644
--- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
@@ -31,7 +31,7 @@ namespace TAO
         }
         case ::PortableServer::ORB_CTRL_MODEL :
         {
-          ACE_ERROR ((LM_ERROR, "Incorrect type in ThreadStrategySingleFactoryImpl"));
+          TAOLIB_ERROR ((LM_ERROR, "Incorrect type in ThreadStrategySingleFactoryImpl"));
           break;
         }
       }