diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2011-10-31 12:35:12 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-01 01:51:32 +0100 |
| commit | 768bc406f7bef67d9803d96c3974e9723cec477d (patch) | |
| tree | 6e4cecf59107e1df44c748eab8e68700e677be0b /src | |
| parent | d7649245ecfe6fac3a5530cd80ffe461fc2ad488 (diff) | |
Use QAtomicInt::store() instead of operator=(int)
... since the latter is now deprecated and will be removed.
Change-Id: I456c1bf93ebf119c028bc4a63f1f8a31f069b83b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/thread/qmutex.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/thread/qmutex.cpp b/src/corelib/thread/qmutex.cpp index 6ba0a8ca35..df36120d88 100644 --- a/src/corelib/thread/qmutex.cpp +++ b/src/corelib/thread/qmutex.cpp @@ -388,7 +388,7 @@ bool QBasicMutex::lockInternal(int timeout) if (d_ptr.testAndSetAcquire(d, dummyLocked())) { // Mutex aquired Q_ASSERT(d->waiters.load() == -QMutexPrivate::BigNumber || d->waiters.load() == 0); - d->waiters = 0; + d->waiters.store(0); d->deref(); return true; } else { @@ -491,7 +491,7 @@ QMutexPrivate *QMutexPrivate::allocate() Q_ASSERT(!d->recursive); Q_ASSERT(!d->possiblyUnlocked.load()); Q_ASSERT(d->waiters.load() == 0); - d->refCount = 1; + d->refCount.store(1); return d; } |