diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2009-11-13 03:26:46 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2009-11-13 03:26:46 (GMT) |
| commit | bc8d2541960c706dbb765755d8c661ae608cbedc (patch) | |
| tree | abea5473fd54b2065bb7929c927ac247a0b213b1 /tests/auto/qscopedpointer | |
| parent | cc1c67088b5eceaa577d7c237391488874efbe90 (diff) | |
| parent | 976fdd41d357dc87bcac7bae496d25f19ee72baf (diff) | |
| download | Qt-bc8d2541960c706dbb765755d8c661ae608cbedc.zip Qt-bc8d2541960c706dbb765755d8c661ae608cbedc.tar.gz Qt-bc8d2541960c706dbb765755d8c661ae608cbedc.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'tests/auto/qscopedpointer')
| -rw-r--r-- | tests/auto/qscopedpointer/tst_qscopedpointer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/qscopedpointer/tst_qscopedpointer.cpp b/tests/auto/qscopedpointer/tst_qscopedpointer.cpp index ddd5579..b99760e 100644 --- a/tests/auto/qscopedpointer/tst_qscopedpointer.cpp +++ b/tests/auto/qscopedpointer/tst_qscopedpointer.cpp @@ -321,7 +321,7 @@ struct RefCounted instanceCount.ref(); } - RefCounted(RefCounted const &other) + RefCounted(RefCounted const &) : ref(0) { instanceCount.ref(); @@ -335,6 +335,7 @@ struct RefCounted RefCounted &operator=(RefCounted const &) { + return *this; } QAtomicInt ref; |