Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1175)

Unified Diff: third_party/mojo/src/mojo/public/cpp/environment/logging.h

Issue 917433003: Update mojo sdk to rev 1027d24a1f68c6d10b7539b32114f1272b2cc9f1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add //build/module_args/mojo.gni. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 {

Powered by Google App Engine
This is Rietveld 408576698