summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJoão Abecasis <joao.abecasis@nokia.com>2012-01-11 16:01:10 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-17 15:37:47 +0100
commit9e9f7a482abbfc862c9a5cc292139a36b5f25700 (patch)
tree354e906307aac4417a6128a60b7e6eb40c16d858 /src
parent301f7b780cbb0e5b1f6c9bf88bdb7dffe9b1110e (diff)
Don't use RefCount int operations
, as those are going away. This cleans use of those operations in the QArrayData stack. Change-Id: I67705fe0a2f8d99ea13739b675021356a5736f83 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/tools/qarraydataops.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qarraydataops.h b/src/corelib/tools/qarraydataops.h
index a3c372fe6b..8800cff028 100644
--- a/src/corelib/tools/qarraydataops.h
+++ b/src/corelib/tools/qarraydataops.h
@@ -83,7 +83,7 @@ struct QPodArrayOps
void destroyAll() // Call from destructors, ONLY!
{
- Q_ASSERT(this->ref == 0);
+ Q_ASSERT(this->ref.atomic.load() == 0);
// As this is to be called only from destructor, it doesn't need to be
// exception safe; size not updated.
@@ -138,7 +138,7 @@ struct QGenericArrayOps
// As this is to be called only from destructor, it doesn't need to be
// exception safe; size not updated.
- Q_ASSERT(this->ref == 0);
+ Q_ASSERT(this->ref.atomic.load() == 0);
const T *const b = this->begin();
const T *i = this->end();