diff options
Diffstat (limited to 'tests/auto/corelib/thread/qthread')
| -rw-r--r-- | tests/auto/corelib/thread/qthread/tst_qthread.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/auto/corelib/thread/qthread/tst_qthread.cpp b/tests/auto/corelib/thread/qthread/tst_qthread.cpp index fcf993bb7b..7c0d8cdc48 100644 --- a/tests/auto/corelib/thread/qthread/tst_qthread.cpp +++ b/tests/auto/corelib/thread/qthread/tst_qthread.cpp @@ -123,10 +123,11 @@ public: QAtomicInt activationCount; inline SignalRecorder() - { activationCount = 0; } + : activationCount(0) + { } bool wasActivated() - { return activationCount > 0; } + { return activationCount.load() > 0; } public slots: void slot(); @@ -907,7 +908,7 @@ void tst_QThread::adoptMultipleThreads() QTestEventLoop::instance().enterLoop(5); QVERIFY(!QTestEventLoop::instance().timeout()); - QCOMPARE(int(recorder.activationCount), numThreads); + QCOMPARE(recorder.activationCount.load(), numThreads); } void tst_QThread::adoptMultipleThreadsOverlap() @@ -949,7 +950,7 @@ void tst_QThread::adoptMultipleThreadsOverlap() QTestEventLoop::instance().enterLoop(5); QVERIFY(!QTestEventLoop::instance().timeout()); - QCOMPARE(int(recorder.activationCount), numThreads); + QCOMPARE(recorder.activationCount.load(), numThreads); } // Disconnects on WinCE, so skip this test. |