Thu Apr 11 15:45:41 UTC 2013 Huang-Ming Huang <huangh@ociweb.com>

11 files changed, 31 insertions, 31 deletions

diff --git a/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp
index d79247a4466..165143d4020 100644
--- a/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp
@@ -4,7 +4,7 @@
 
 #if defined (__NetBSD__) || defined (__OpenBSD__)
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_stdio.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -56,7 +56,7 @@ namespace ACE
 
       if (fd == -1)
         {
-          ACE_ERROR ((LM_ERROR, ACE_TEXT ("socket failed\n")));
+          ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("socket failed\n")));
           return;
         }
 
@@ -64,7 +64,7 @@ namespace ACE
 
       if (getifaddrs (&ifap) < 0)
         {
-          ACE_ERROR ((LM_ERROR, ACE_TEXT ("getifaddrs failed\n")));
+          ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("getifaddrs failed\n")));
           close (fd);
           return;
         }
@@ -96,7 +96,7 @@ namespace ACE
 #endif
           if (ioctl (fd, SIOCGIFDATA, &ifdr) == -1)
             {
-              ACE_ERROR ((LM_ERROR, ACE_TEXT ("SIOCGIFDATA failed\n")));
+              ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("SIOCGIFDATA failed\n")));
             }
 
 #if defined (__OpenBSD__)
diff --git a/ACE/ace/Monitor_Control/CPU_Load_Monitor.cpp b/ACE/ace/Monitor_Control/CPU_Load_Monitor.cpp
index 8d11650fea5..f7b4e862436 100644
--- a/ACE/ace/Monitor_Control/CPU_Load_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/CPU_Load_Monitor.cpp
@@ -126,7 +126,7 @@ namespace ACE
 
       if (this->file_ptr_ == 0)
         {
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("CPU load - opening /proc/stat failed\n")));
           return;
         }
@@ -168,7 +168,7 @@ namespace ACE
 
       if (this->kstats_ == 0)
         {
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("opening kstats file failed\n")));
           return;
         }
@@ -224,7 +224,7 @@ namespace ACE
 
               if (! this->kstat_id_ > 0)
                 {
-                  ACE_ERROR ((LM_ERROR,
+                  ACELIB_ERROR ((LM_ERROR,
                               ACE_TEXT ("kstat chain update ")
                               ACE_TEXT ("returned null id\n")));
                   return;
@@ -241,7 +241,7 @@ namespace ACE
 
       if (status != 0)
         {
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("closing kstats file failed\n")));
         }
     }
diff --git a/ACE/ace/Monitor_Control/Constraint_Interpreter.cpp b/ACE/ace/Monitor_Control/Constraint_Interpreter.cpp
index 42a3b854a84..276c2304d31 100644
--- a/ACE/ace/Monitor_Control/Constraint_Interpreter.cpp
+++ b/ACE/ace/Monitor_Control/Constraint_Interpreter.cpp
@@ -4,7 +4,7 @@
 
 #if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 #include "ace/ETCL/ETCL_Constraint.h"
 
@@ -39,7 +39,7 @@ namespace ACE
           /// root_ is set in this base class call.
           if (ETCL_Interpreter::build_tree (constraints) != 0)
             {
-              ACE_ERROR_RETURN ((LM_ERROR,
+              ACELIB_ERROR_RETURN ((LM_ERROR,
                                  "Constraint_Interpreter::build_tree() - "
                                  "ETCL_Interpreter::build_tree() failed\n"),
                                 -1);
diff --git a/ACE/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp
index 3d6e4b2e177..9bebd03dacb 100644
--- a/ACE/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp
@@ -4,7 +4,7 @@
 
 #if defined (__FreeBSD__) || defined (__Lynx__)
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_stdio.h"
 
 #include <sys/types.h>
@@ -66,7 +66,7 @@ namespace ACE
 
       if (::sysctl(req_name, 5, &ifcount, &ifcount_len, (void *)0, 0) == -1)
       {
-        ACE_ERROR((LM_ERROR, ACE_TEXT("(%P|%t) %p\n"),
+        ACELIB_ERROR((LM_ERROR, ACE_TEXT("(%P|%t) %p\n"),
                   ACE_TEXT("sysctl failed")));
 
         return;
@@ -87,7 +87,7 @@ namespace ACE
 
         if(::sysctl(name, 6, &ifmd, &len, (void *)0, 0) == -1)
         {
-          ACE_ERROR((LM_ERROR, ACE_TEXT("(%P|%t) %p\n"),
+          ACELIB_ERROR((LM_ERROR, ACE_TEXT("(%P|%t) %p\n"),
                ACE_TEXT("sysctl failed")));
 
           break;
diff --git a/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp
index 32588390ccd..255354250b5 100644
--- a/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp
@@ -4,7 +4,7 @@
 
 #if defined (ACE_LINUX) || defined (AIX)
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_stdio.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -31,7 +31,7 @@ namespace ACE
 
       if (fp == 0)
         {
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("bytes sent - opening ")
                       ACE_TEXT ("/proc/net/dev failed\n")));
           return;
@@ -90,7 +90,7 @@ namespace ACE
 
       if (fp == 0)
         {
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("bytes sent - opening ")
                       ACE_TEXT ("/proc/net/dev failed\n")));
           return;
diff --git a/ACE/ace/Monitor_Control/Memory_Usage_Monitor.cpp b/ACE/ace/Monitor_Control/Memory_Usage_Monitor.cpp
index 179c6c144ef..c56fd4add75 100644
--- a/ACE/ace/Monitor_Control/Memory_Usage_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/Memory_Usage_Monitor.cpp
@@ -34,7 +34,7 @@ namespace ACE
 #elif defined (ACE_HAS_LINUX_SYSINFO)
       if (::sysinfo (&this->sysinfo_) != 0)
         {
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("Memory usage - sysinfo() failed\n")));
           return;
         }
diff --git a/ACE/ace/Monitor_Control/Monitor_Query.cpp b/ACE/ace/Monitor_Control/Monitor_Query.cpp
index 997ffcbcd6a..30c0768c9b9 100644
--- a/ACE/ace/Monitor_Control/Monitor_Query.cpp
+++ b/ACE/ace/Monitor_Control/Monitor_Query.cpp
@@ -41,7 +41,7 @@ namespace ACE
 
       if (this->monitor_ == 0)
         {
-          ACE_ERROR ((LM_ERROR, "Monitor_Query - monitor lookup failed\n"));
+          ACELIB_ERROR ((LM_ERROR, "Monitor_Query - monitor lookup failed\n"));
         }
     }
 
@@ -50,7 +50,7 @@ namespace ACE
     {
       if (this->monitor_ == 0)
         {
-          ACE_ERROR ((LM_ERROR, "Monitor_Query::query - null monitor\n"));
+          ACELIB_ERROR ((LM_ERROR, "Monitor_Query::query - null monitor\n"));
           return;
         }
 
diff --git a/ACE/ace/Monitor_Control/Num_Threads_Monitor.cpp b/ACE/ace/Monitor_Control/Num_Threads_Monitor.cpp
index 7c9c5e6e177..2609f569ad2 100644
--- a/ACE/ace/Monitor_Control/Num_Threads_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/Num_Threads_Monitor.cpp
@@ -40,7 +40,7 @@ namespace ACE
 
       if (this->file_ptr_ == 0)
         {
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("Num threads - opening ")
                       ACE_TEXT ("/proc/self/status failed\n")));
           return;
diff --git a/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp
index 86170fd6c6d..b1db0ebebcc 100644
--- a/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp
@@ -4,7 +4,7 @@
 
 #if defined (ACE_HAS_KSTAT)
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_stdio.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -61,7 +61,7 @@ namespace ACE
 
       if (this->kstats_ == 0)
         {
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("opening kstats file failed\n")));
           return;
         }
@@ -139,7 +139,7 @@ namespace ACE
 
               if (! this->kstat_id_ > 0)
                 {
-                  ACE_ERROR ((LM_ERROR, "kstat is is not > 0.\n"));
+                  ACELIB_ERROR ((LM_ERROR, "kstat is is not > 0.\n"));
                   break;
                 }
             }
@@ -153,7 +153,7 @@ namespace ACE
 
       if (status != 0)
         {
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("closing kstats file failed\n")));
         }
     }
@@ -168,7 +168,7 @@ namespace ACE
     {
       if (! (ks_instance < which_max))
         {
-          ACE_ERROR_RETURN ((LM_ERROR,
+          ACELIB_ERROR_RETURN ((LM_ERROR,
                              "%s exceeded.\n",
                              max_str),
                             -1);
@@ -201,7 +201,7 @@ namespace ACE
 
       if (value->data_type != KSTAT_DATA_UINT32)
         {
-          ACE_ERROR_RETURN ((LM_ERROR,
+          ACELIB_ERROR_RETURN ((LM_ERROR,
                              "Wrong data type.\n"),
                             -1);
         }
diff --git a/ACE/ace/Monitor_Control/Windows_Monitor.cpp b/ACE/ace/Monitor_Control/Windows_Monitor.cpp
index 4177eb87ed7..f5ed8dd8115 100644
--- a/ACE/ace/Monitor_Control/Windows_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/Windows_Monitor.cpp
@@ -4,7 +4,7 @@
 
 #if defined (ACE_HAS_WIN32_PDH)
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -52,7 +52,7 @@ namespace ACE
 
       if (ERROR_SUCCESS != this->status_)
         {
-          ACE_ERROR ((LM_DEBUG, ACE_TEXT ("PdhOpenQuery failed\n")));
+          ACELIB_ERROR ((LM_DEBUG, ACE_TEXT ("PdhOpenQuery failed\n")));
         }
 
       this->status_ =
@@ -63,7 +63,7 @@ namespace ACE
 
       if (ERROR_SUCCESS != this->status_)
         {
-          ACE_ERROR ((LM_DEBUG,
+          ACELIB_ERROR ((LM_DEBUG,
                       ACE_TEXT ("PdhAddCounter %s failed\n"),
                       this->path_.c_str ()));
         }
diff --git a/ACE/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp b/ACE/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp
index 7bd77a67637..bf388fe5f58 100644
--- a/ACE/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp
@@ -4,7 +4,7 @@
 
 #if defined (ACE_HAS_WIN32_PDH)
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/SString.h"
 #include "ace/os_include/os_pdhmsg.h"
 
@@ -44,7 +44,7 @@ namespace ACE
 
       if (PDH_CSTATUS_VALID_DATA != static_cast<DWORD> (this->status_))
         {
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("%s: PdhExpandCounterPath failed\n"),
                       wildcard_path));
         }