This is an automated email from the ASF dual-hosted git repository.

jamesge pushed a commit to branch master
in repository

The following commit(s) were added to refs/heads/master by this push:
     new ee1fee9  fix bug: logging conflict
     new 23bf4b7  Merge pull request #902 from liupengs/fix-bug-log-conflict
ee1fee9 is described below

commit ee1fee9ae87d0fe69a83f741f9993db73ce21aa7
Author: LiuPeng <>
AuthorDate: Sat Aug 24 17:54:49 2019 +0800

    fix bug: logging conflict
 src/butil/logging.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/butil/logging.h b/src/butil/logging.h
index 99ade10..c959fff 100644
--- a/src/butil/logging.h
+++ b/src/butil/logging.h
@@ -383,7 +383,7 @@ const LogSeverity BLOG_0 = BLOG_ERROR;
 // LOG_IS_ON(DFATAL) always holds in debug mode. In particular, CHECK()s will
 // always fire if they fail.
 #define LOG_IS_ON(severity)                                     \
-    (logging::BLOG_##severity >= ::logging::GetMinLogLevel())
+    (::logging::BLOG_##severity >= ::logging::GetMinLogLevel())
 #if defined(__GNUC__)
 // We emit an anonymous static int* variable at every VLOG_IS_ON(n) site.

To unsubscribe, e-mail:
For additional commands, e-mail:

Reply via email to