diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2011-11-07 13:39:35 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-16 10:32:10 +0100 |
commit | 6fcfae99d3615c7a850e4933691763097078c8e4 (patch) | |
tree | 52267f0f8a8c42c8bd07a7f624934f0919fa97e4 /tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp | |
parent | 2f90c4e40ec3e15ba4aeaad178e154a3538c46c2 (diff) |
Remove warnings from deprecated atomic operators in autotests
Use QAtomic*::load() and ::store() instead of the deprecated
cast, assignment, and comparison operators. These will be removed
in the near future.
The tests for these particular operators have not been changed,
though, as the change to remove the operators will also remove
the respective tests.
Change-Id: I2f24d18992af0c6e0f487d707218e4e84f4bdd12
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp')
-rw-r--r-- | tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp b/tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp index c18dad93a3..1c60621763 100644 --- a/tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp +++ b/tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp @@ -2152,8 +2152,8 @@ public: void updatePeak() { forever { - const int localPeak = peakInstanceCount; - const int localCurrent = currentInstanceCount; + const int localPeak = peakInstanceCount.load(); + const int localCurrent = currentInstanceCount.load(); if (localCurrent <= localPeak) break; if (peakInstanceCount.testAndSetOrdered(localPeak, localCurrent)) @@ -2191,35 +2191,35 @@ void tst_QtConcurrentMap::throttling() const int allowedTemporaries = QThread::idealThreadCount() * 40; { - currentInstanceCount = 0; - peakInstanceCount = 0; + currentInstanceCount.store(0); + peakInstanceCount.store(0); QList<InstanceCounter> instances; for (int i = 0; i < itemcount; ++i) instances.append(InstanceCounter()); - QCOMPARE((int)currentInstanceCount, itemcount); + QCOMPARE(currentInstanceCount.load(), itemcount); int results = QtConcurrent::blockingMappedReduced(instances, slowMap, fastReduce); QCOMPARE(results, itemcount); - QCOMPARE(int(currentInstanceCount), itemcount); - QVERIFY(int(peakInstanceCount) < itemcount + allowedTemporaries); + QCOMPARE(currentInstanceCount.load(), itemcount); + QVERIFY(peakInstanceCount.load() < itemcount + allowedTemporaries); } { - QCOMPARE(int(currentInstanceCount), 0); - peakInstanceCount = 0; + QCOMPARE(currentInstanceCount.load(), 0); + peakInstanceCount.store(0); QList<InstanceCounter> instances; for (int i = 0; i < itemcount; ++i) instances.append(InstanceCounter()); - QCOMPARE(int(currentInstanceCount), itemcount); + QCOMPARE(currentInstanceCount.load(), itemcount); int results = QtConcurrent::blockingMappedReduced(instances, fastMap, slowReduce); QCOMPARE(results, itemcount); - QCOMPARE((int)currentInstanceCount, itemcount); - QVERIFY(int(peakInstanceCount) < itemcount + allowedTemporaries); + QCOMPARE(currentInstanceCount.load(), itemcount); + QVERIFY(peakInstanceCount.load() < itemcount + allowedTemporaries); } } @@ -2353,8 +2353,8 @@ InstanceCounter ic_fn(const InstanceCounter & ic) // assigned over with operator == void tst_QtConcurrentMap::qFutureAssignmentLeak() { - currentInstanceCount = 0; - peakInstanceCount = 0; + currentInstanceCount.store(0); + peakInstanceCount.store(0); QFuture<InstanceCounter> future; { QList<InstanceCounter> list; @@ -2370,9 +2370,9 @@ void tst_QtConcurrentMap::qFutureAssignmentLeak() future.waitForFinished(); } - QCOMPARE(int(currentInstanceCount), 1000); + QCOMPARE(currentInstanceCount.load(), 1000); future = QFuture<InstanceCounter>(); - QCOMPARE(int(currentInstanceCount), 0); + QCOMPARE(currentInstanceCount.load(), 0); } inline void increment(int &num) |