synchronization/condition_variable.h - Issue 2045223003: Update to Chromium //base at Chromium commit 82baa9afc6620c68cb2168f20bb65e77e3e57f0a.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: synchronization/condition_variable.h

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

Index: synchronization/condition_variable.h

diff --git a/synchronization/condition_variable.h b/synchronization/condition_variable.h

index 5d8507d43730dbca5793d65c8a9caa582c193d2b..91e4d1350d619ffcd8f44fb108368737e7b3366c 100644

--- a/synchronization/condition_variable.h

+++ b/synchronization/condition_variable.h

@@ -73,6 +73,7 @@

#include "base/base_export.h"

#include "base/basictypes.h"

+#include "base/logging.h"

#include "base/synchronization/lock.h"

namespace base {

@@ -104,7 +105,7 @@ class BASE_EXPORT ConditionVariable {

#elif defined(OS_POSIX)

pthread_cond_t condition_;

pthread_mutex_t* user_mutex_;

-#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)

+#if DCHECK_IS_ON()

base::Lock* user_lock_; // Needed to adjust shadow lock state on wait.

#endif

« no previous file with comments | « sync_socket.h ('k') | synchronization/condition_variable_posix.cc » ('j') | no next file with comments »