Index: third_party/mojo/src/mojo/public/cpp/environment/logging.h |
diff --git a/third_party/mojo/src/mojo/public/cpp/environment/logging.h b/third_party/mojo/src/mojo/public/cpp/environment/logging.h |
index 5df18fb542272dc8d44e5c8aa5c961e52314e81c..2cf873a30e55bbf451810d74c111f224b2624f00 100644 |
--- a/third_party/mojo/src/mojo/public/cpp/environment/logging.h |
+++ b/third_party/mojo/src/mojo/public/cpp/environment/logging.h |
@@ -43,20 +43,20 @@ |
// compile) the condition, whereas |MOJO_DCHECK()| "neuters" the condition |
// (i.e., compiles, but doesn't evaluate). |
#ifdef NDEBUG |
- |
#define MOJO_DLOG(level) MOJO_LAZY_LOG_STREAM(level, false) |
#define MOJO_DLOG_IF(level, condition) MOJO_LAZY_LOG_STREAM(level, false) |
-#define MOJO_DCHECK(condition) \ |
- MOJO_LAZY_LOG_STREAM(FATAL, false ? !(condition) : false) |
- |
#else |
- |
#define MOJO_DLOG(level) MOJO_LOG(level) |
#define MOJO_DLOG_IF(level, condition) MOJO_LOG_IF(level, condition) |
-#define MOJO_DCHECK(condition) MOJO_CHECK(condition) |
- |
#endif // NDEBUG |
+#if defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON) |
+#define MOJO_DCHECK(condition) \ |
+ MOJO_LAZY_LOG_STREAM(FATAL, false ? !(condition) : false) |
+#else |
+#define MOJO_DCHECK(condition) MOJO_CHECK(condition) |
+#endif // NDEBUG && !defined(DCHECK_ALWAYS_ON) |
+ |
namespace mojo { |
namespace internal { |