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

Unified Diff: synchronization/lock.cc

Issue 2045223003: Update to Chromium //base at Chromium commit 82baa9afc6620c68cb2168f20bb65e77e3e57f0a. (Closed) Base URL: https://github.com/domokit/base.git@master
Patch Set: Created 4 years, 6 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
« no previous file with comments | « synchronization/lock.h ('k') | test/test_support_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: synchronization/lock.cc
diff --git a/synchronization/lock.cc b/synchronization/lock.cc
index b1576c50c713186f95f9c3d190d635b825996098..03297ada52fb2ab216b052ffeda90e130d29a206 100644
--- a/synchronization/lock.cc
+++ b/synchronization/lock.cc
@@ -6,10 +6,9 @@
// is functionally a wrapper around the LockImpl class, so the only
// real intelligence in the class is in the debugging logic.
-#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
-
#include "base/synchronization/lock.h"
-#include "base/logging.h"
+
+#if DCHECK_IS_ON()
namespace base {
@@ -36,4 +35,4 @@ void Lock::CheckUnheldAndMark() {
} // namespace base
-#endif // !NDEBUG || DCHECK_ALWAYS_ON
+#endif // DCHECK_IS_ON()
« no previous file with comments | « synchronization/lock.h ('k') | test/test_support_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698