about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAbseil Team <absl-team@google.com>2018-07-13T16·29-0700
committerXiaoyi Zhang <zhangxy988@gmail.com>2018-07-13T20·43-0400
commit7b50a4a94b0c7df68b3a854c850b551aaef0a8b4 (patch)
tree9e2e4ac4273aaf68f0c3aacc9739c45c3d1c9abe
parenta5030ca5125b9d557ecfeea8acc8b1a8e49f6d27 (diff)
Export of internal Abseil changes.
--
50154b443b21a5123c50bebcfb866581e2e5b907 by Xiaoyi Zhang <zhangxy@google.com>:

Import https://github.com/abseil/abseil-cpp/pull/144

PiperOrigin-RevId: 204482647

--
ffefb7e0f9861a24296e672a5e32bbb56051239a by Abseil Team <absl-team@google.com>:

Cast ABSL_MIN_LOG_LEVEL to absl::LogSeverity rather than casting severity to int.  This allows it to be defined symbolically e.g. -DABSL_MIN_LOG_LEVEL=absl::LogSeverity::kError.

PiperOrigin-RevId: 204347589
GitOrigin-RevId: 50154b443b21a5123c50bebcfb866581e2e5b907
Change-Id: I728baa8a3ad11ca28b731cc7979238c163e9c9a4
-rw-r--r--absl/base/internal/raw_logging.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/absl/base/internal/raw_logging.cc b/absl/base/internal/raw_logging.cc
index 41101bd72eb8..d9485a66cc64 100644
--- a/absl/base/internal/raw_logging.cc
+++ b/absl/base/internal/raw_logging.cc
@@ -139,7 +139,7 @@ void RawLogVA(absl::LogSeverity severity, const char* file, int line,
 #endif
 
 #ifdef ABSL_MIN_LOG_LEVEL
-  if (static_cast<int>(severity) < ABSL_MIN_LOG_LEVEL &&
+  if (severity < static_cast<absl::LogSeverity>(ABSL_MIN_LOG_LEVEL) &&
       severity < absl::LogSeverity::kFatal) {
     enabled = false;
   }