summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/tools/qscopedpointer
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2011-11-07 13:39:35 +0100
committerQt by Nokia <qt-info@nokia.com>2011-11-16 10:32:10 +0100
commit6fcfae99d3615c7a850e4933691763097078c8e4 (patch)
tree52267f0f8a8c42c8bd07a7f624934f0919fa97e4 /tests/auto/corelib/tools/qscopedpointer
parent2f90c4e40ec3e15ba4aeaad178e154a3538c46c2 (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/tools/qscopedpointer')
-rw-r--r--tests/auto/corelib/tools/qscopedpointer/tst_qscopedpointer.cpp42
1 files changed, 21 insertions, 21 deletions
diff --git a/tests/auto/corelib/tools/qscopedpointer/tst_qscopedpointer.cpp b/tests/auto/corelib/tools/qscopedpointer/tst_qscopedpointer.cpp
index 06c0ecbafd..186a6c2d5d 100644
--- a/tests/auto/corelib/tools/qscopedpointer/tst_qscopedpointer.cpp
+++ b/tests/auto/corelib/tools/qscopedpointer/tst_qscopedpointer.cpp
@@ -330,7 +330,7 @@ struct RefCounted
~RefCounted()
{
- QVERIFY( ref == 0 );
+ QVERIFY( ref.load() == 0 );
instanceCount.deref();
}
@@ -372,13 +372,13 @@ void scopedPointerComparisonTest(const A1 &a1, const A2 &a2, const B &b)
void tst_QScopedPointer::comparison()
{
- QCOMPARE( int(RefCounted::instanceCount), 0 );
+ QCOMPARE( RefCounted::instanceCount.load(), 0 );
{
RefCounted *a = new RefCounted;
RefCounted *b = new RefCounted;
- QCOMPARE( int(RefCounted::instanceCount), 2 );
+ QCOMPARE( RefCounted::instanceCount.load(), 2 );
QScopedPointer<RefCounted> pa1(a);
QScopedPointer<RefCounted> pa2(a);
@@ -390,16 +390,16 @@ void tst_QScopedPointer::comparison()
pa2.take();
- QCOMPARE( int(RefCounted::instanceCount), 2 );
+ QCOMPARE( RefCounted::instanceCount.load(), 2 );
}
- QCOMPARE( int(RefCounted::instanceCount), 0 );
+ QCOMPARE( RefCounted::instanceCount.load(), 0 );
{
RefCounted *a = new RefCounted[42];
RefCounted *b = new RefCounted[43];
- QCOMPARE( int(RefCounted::instanceCount), 85 );
+ QCOMPARE( RefCounted::instanceCount.load(), 85 );
QScopedArrayPointer<RefCounted> pa1(a);
QScopedArrayPointer<RefCounted> pa2(a);
@@ -409,10 +409,10 @@ void tst_QScopedPointer::comparison()
pa2.take();
- QCOMPARE( int(RefCounted::instanceCount), 85 );
+ QCOMPARE( RefCounted::instanceCount.load(), 85 );
}
- QCOMPARE( int(RefCounted::instanceCount), 0 );
+ QCOMPARE( RefCounted::instanceCount.load(), 0 );
{
// QScopedSharedPointer is an internal helper class -- it is unsupported!
@@ -420,42 +420,42 @@ void tst_QScopedPointer::comparison()
RefCounted *a = new RefCounted;
RefCounted *b = new RefCounted;
- QCOMPARE( int(RefCounted::instanceCount), 2 );
+ QCOMPARE( RefCounted::instanceCount.load(), 2 );
QSharedDataPointer<RefCounted> pa1(a);
QSharedDataPointer<RefCounted> pa2(a);
QSharedDataPointer<RefCounted> pb(b);
- QCOMPARE( int(a->ref), 2 );
- QCOMPARE( int(b->ref), 1 );
- QCOMPARE( int(RefCounted::instanceCount), 2 );
+ QCOMPARE( a->ref.load(), 2 );
+ QCOMPARE( b->ref.load(), 1 );
+ QCOMPARE( RefCounted::instanceCount.load(), 2 );
scopedPointerComparisonTest(pa1, pa2, pb);
- QCOMPARE( int(RefCounted::instanceCount), 2 );
+ QCOMPARE( RefCounted::instanceCount.load(), 2 );
}
- QCOMPARE( int(RefCounted::instanceCount), 0 );
+ QCOMPARE( RefCounted::instanceCount.load(), 0 );
}
void tst_QScopedPointer::array()
{
- int instCount = RefCounted::instanceCount;
+ int instCount = RefCounted::instanceCount.load();
{
QScopedArrayPointer<RefCounted> array;
array.reset(new RefCounted[42]);
- QCOMPARE(instCount + 42, int(RefCounted::instanceCount));
+ QCOMPARE(instCount + 42, RefCounted::instanceCount.load());
}
- QCOMPARE(instCount, int(RefCounted::instanceCount));
+ QCOMPARE(instCount, RefCounted::instanceCount.load());
{
QScopedArrayPointer<RefCounted> array(new RefCounted[42]);
- QCOMPARE(instCount + 42, int(RefCounted::instanceCount));
+ QCOMPARE(instCount + 42, RefCounted::instanceCount.load());
array.reset(new RefCounted[28]);
- QCOMPARE(instCount + 28, int(RefCounted::instanceCount));
+ QCOMPARE(instCount + 28, RefCounted::instanceCount.load());
array.reset(0);
- QCOMPARE(instCount, int(RefCounted::instanceCount));
+ QCOMPARE(instCount, RefCounted::instanceCount.load());
}
- QCOMPARE(instCount, int(RefCounted::instanceCount));
+ QCOMPARE(instCount, RefCounted::instanceCount.load());
}