diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
commit | 8dd16259287f58f9273002717ec4d27e97127719 (patch) | |
tree | 3863e62a53829a84037444beab3abd4ed9dfc7d0 /js/src/threading/ConditionVariable.h | |
parent | Releasing progress-linux version 126.0.1-1~progress7.99u1. (diff) | |
download | firefox-8dd16259287f58f9273002717ec4d27e97127719.tar.xz firefox-8dd16259287f58f9273002717ec4d27e97127719.zip |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'js/src/threading/ConditionVariable.h')
-rw-r--r-- | js/src/threading/ConditionVariable.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/js/src/threading/ConditionVariable.h b/js/src/threading/ConditionVariable.h index e2b8865cbf..5ff0590c5c 100644 --- a/js/src/threading/ConditionVariable.h +++ b/js/src/threading/ConditionVariable.h @@ -55,7 +55,7 @@ class ConditionVariable { lock.postLockChecks(); #endif } - void wait(UniqueLock<Mutex>& lock) { wait(lock.lock); } + void wait(UniqueLock<Mutex>& lock) { wait(lock.mutex); } // As with |wait|, block the current thread of execution until woken from // another thread. This method will resume waiting once woken until the given @@ -100,15 +100,15 @@ class ConditionVariable { CVStatus wait_for(UniqueLock<Mutex>& lock, const mozilla::TimeDuration& rel_time) { #ifdef DEBUG - lock.lock.preUnlockChecks(); + lock.mutex.preUnlockChecks(); #endif CVStatus res = - impl_.wait_for(lock.lock.impl_, rel_time) == mozilla::CVStatus::Timeout + impl_.wait_for(lock.mutex.impl_, rel_time) == mozilla::CVStatus::Timeout ? CVStatus::Timeout : CVStatus::NoTimeout; #ifdef DEBUG - lock.lock.preLockChecks(); - lock.lock.postLockChecks(); + lock.mutex.preLockChecks(); + lock.mutex.postLockChecks(); #endif return res; } |