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

Unified Diff: synchronization/condition_variable_win.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/condition_variable_posix.cc ('k') | synchronization/lock.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: synchronization/condition_variable_win.cc
diff --git a/synchronization/condition_variable_win.cc b/synchronization/condition_variable_win.cc
index 470e564c5b071b75dc3c5219423ec191cefd9f4f..4256ac8224d48de600a50c18e1b3d3cf1aed36f6 100644
--- a/synchronization/condition_variable_win.cc
+++ b/synchronization/condition_variable_win.cc
@@ -8,7 +8,6 @@
#include <stack>
#include "base/compiler_specific.h"
-#include "base/logging.h"
#include "base/synchronization/lock.h"
#include "base/threading/thread_restrictions.h"
#include "base/time/time.h"
@@ -99,7 +98,7 @@ void WinVistaCondVar::TimedWait(const TimeDelta& max_time) {
DWORD timeout = static_cast<DWORD>(max_time.InMilliseconds());
CRITICAL_SECTION* cs = user_lock_.lock_.native_handle();
-#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
+#if DCHECK_IS_ON()
user_lock_.CheckHeldAndUnmark();
#endif
« no previous file with comments | « synchronization/condition_variable_posix.cc ('k') | synchronization/lock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698