diff options
| author | Jay Civelli <jcivelli@google.com> | 2017-03-22 17:31:44 -0700 |
|---|---|---|
| committer | Treehugger Robot <treehugger-gerrit@google.com> | 2017-07-26 01:47:45 +0000 |
| commit | 0601274935e7f632eb0d6ce0fd223b744349d20b (patch) | |
| tree | 09642629eabdbeccfd68e6338253228465088c57 /base/synchronization/condition_variable_posix.cc | |
| parent | f320c0cf71af274e34404746d4303e6a2452e2d6 (diff) | |
| download | libchrome-0601274935e7f632eb0d6ce0fd223b744349d20b.tar.gz | |
libchrome: Uprev the library to r456626 from Chromium
Pulled the latest and greatest version of libchrome from Chromium.
The merge was done against r456626 which corresponds to git commit
08266b3fca707804065a2cfd60331722ade41969 of Mar 14, 2017
Notable changes are:
- FOR_EACH_OBSERVER macro removed (replaced by use of C++ 11
range-base for loop)
- base::Values no more FundamentalValue
- stl_util moved to base namespace
- some scoped pointers removed in crypto/ in favor
of BoringSSL UniquePtr.
- path() accessor renamed to GetPath() in ScopedTempDir (and other
classes)
- introduction of base::CallbackOnce
Test: All unit-tests should still pass.
Change-Id: I5c2cb41ea4c037fe69fbb425e711b1399d55d591
Diffstat (limited to 'base/synchronization/condition_variable_posix.cc')
| -rw-r--r-- | base/synchronization/condition_variable_posix.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/base/synchronization/condition_variable_posix.cc b/base/synchronization/condition_variable_posix.cc index d86fd180ec..d07c671810 100644 --- a/base/synchronization/condition_variable_posix.cc +++ b/base/synchronization/condition_variable_posix.cc @@ -118,6 +118,8 @@ void ConditionVariable::TimedWait(const TimeDelta& max_time) { #endif // OS_ANDROID && HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC #endif // OS_MACOSX + // On failure, we only expect the CV to timeout. Any other error value means + // that we've unexpectedly woken up. DCHECK(rv == 0 || rv == ETIMEDOUT); #if DCHECK_IS_ON() user_lock_->CheckUnheldAndMark(); |