Index: base/logging.h |
diff --git a/base/logging.h b/base/logging.h |
index b1f1ebd1d282db06fd5587eaf581005a386c0226..8a268faec5fb4c7f19a92a6bc71ac3dcbeb06880 100644 |
--- a/base/logging.h |
+++ b/base/logging.h |
@@ -575,9 +575,9 @@ DEFINE_CHECK_OP_IMPL(GT, > ) |
#endif |
#if defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON) |
-#define ENABLE_DCHECK 0 |
+#define DCHECK_IS_ON 0 |
#else |
-#define ENABLE_DCHECK 1 |
+#define DCHECK_IS_ON 1 |
#endif |
// Definitions for DLOG et al. |
@@ -642,44 +642,40 @@ enum { DEBUG_MODE = ENABLE_DLOG }; |
// Definitions for DCHECK et al. |
-#if ENABLE_DCHECK |
+#if DCHECK_IS_ON |
#define COMPACT_GOOGLE_LOG_EX_DCHECK(ClassName, ...) \ |
COMPACT_GOOGLE_LOG_EX_FATAL(ClassName , ##__VA_ARGS__) |
#define COMPACT_GOOGLE_LOG_DCHECK COMPACT_GOOGLE_LOG_FATAL |
const LogSeverity LOG_DCHECK = LOG_FATAL; |
-#define DCHECK_IS_ON() true |
-#else // ENABLE_DCHECK |
+#else // DCHECK_IS_ON |
-// These are just dummy values since DCHECK_IS_ON() is always false in |
-// this case. |
+// These are just dummy values. |
#define COMPACT_GOOGLE_LOG_EX_DCHECK(ClassName, ...) \ |
COMPACT_GOOGLE_LOG_EX_INFO(ClassName , ##__VA_ARGS__) |
#define COMPACT_GOOGLE_LOG_DCHECK COMPACT_GOOGLE_LOG_INFO |
const LogSeverity LOG_DCHECK = LOG_INFO; |
-#define DCHECK_IS_ON() false |
-#endif // ENABLE_DCHECK |
-#undef ENABLE_DCHECK |
+#endif // DCHECK_IS_ON |
// DCHECK et al. make sure to reference |condition| regardless of |
// whether DCHECKs are enabled; this is so that we don't get unused |
// variable warnings if the only use of a variable is in a DCHECK. |
// This behavior is different from DLOG_IF et al. |
-#define DCHECK(condition) \ |
- LAZY_STREAM(LOG_STREAM(DCHECK), DCHECK_IS_ON() && !(condition)) \ |
+#define DCHECK(condition) \ |
+ LAZY_STREAM(LOG_STREAM(DCHECK), DCHECK_IS_ON && !(condition)) \ |
<< "Check failed: " #condition ". " |
-#define DPCHECK(condition) \ |
- LAZY_STREAM(PLOG_STREAM(DCHECK), DCHECK_IS_ON() && !(condition)) \ |
+#define DPCHECK(condition) \ |
+ LAZY_STREAM(PLOG_STREAM(DCHECK), DCHECK_IS_ON && !(condition)) \ |
<< "Check failed: " #condition ". " |
// Helper macro for binary operators. |
// Don't use this macro directly in your code, use DCHECK_EQ et al below. |
#define DCHECK_OP(name, op, val1, val2) \ |
- if (DCHECK_IS_ON()) \ |
+ if (DCHECK_IS_ON) \ |
if (std::string* _result = \ |
logging::Check##name##Impl((val1), (val2), \ |
#val1 " " #op " " #val2)) \ |