summaryrefslogtreecommitdiffstats
path: root/src/corelib/thread/qreadwritelock.cpp
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2019-04-16 16:32:08 +0200
committerTobias Hunger <tobias.hunger@qt.io>2019-04-16 16:32:08 +0200
commit6630937e63ae5797487b86743a7733c8ae5cc42c (patch)
tree3d53dacf6430f9099e1fb20835881205de674961 /src/corelib/thread/qreadwritelock.cpp
parent37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff)
parentc7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff)
Merge commit 'dev' into 'wip/cmake-merge'
Diffstat (limited to 'src/corelib/thread/qreadwritelock.cpp')
-rw-r--r--src/corelib/thread/qreadwritelock.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/thread/qreadwritelock.cpp b/src/corelib/thread/qreadwritelock.cpp
index 21835ff592..d7cf7a7284 100644
--- a/src/corelib/thread/qreadwritelock.cpp
+++ b/src/corelib/thread/qreadwritelock.cpp
@@ -622,14 +622,14 @@ QReadWriteLockPrivate *QReadWriteLockPrivate::allocate()
QReadWriteLockPrivate *d = &(*freelist)[i];
d->id = i;
Q_ASSERT(!d->recursive);
- Q_ASSERT(!d->waitingReaders && !d->waitingReaders && !d->readerCount && !d->writerCount);
+ Q_ASSERT(!d->waitingReaders && !d->waitingWriters && !d->readerCount && !d->writerCount);
return d;
}
void QReadWriteLockPrivate::release()
{
Q_ASSERT(!recursive);
- Q_ASSERT(!waitingReaders && !waitingReaders && !readerCount && !writerCount);
+ Q_ASSERT(!waitingReaders && !waitingWriters && !readerCount && !writerCount);
freelist->release(id);
}