summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qarraydata.h
diff options
context:
space:
mode:
authorJoão Abecasis <joao.abecasis@nokia.com>2011-12-16 16:21:29 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-04 23:38:06 +0100
commit3fad9a846f6a89bd342b25c319d0263794bda575 (patch)
tree73b2f99e8939fc443f5be77884bf051157accd4d /src/corelib/tools/qarraydata.h
parent7fadc3ce322706ed6c36ad907e83fed1992b490e (diff)
Retire the generic Q_REFCOUNT_INITIALIZER macro
This was only being used to initialize static read-only RefCount instances, where the value is hard-wired to -1. Instead of allowing initialization with arbitrary values (which for a reference count can be error prone) the intent of the macro is made explicit with its replacement Q_REFCOUNT_INITIALIZE_STATIC. Change-Id: I5b0f3f1eb58c3d010e49e9259ff4d06cbab2fd35 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/tools/qarraydata.h')
-rw-r--r--src/corelib/tools/qarraydata.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qarraydata.h b/src/corelib/tools/qarraydata.h
index 1312feccdb..b7ab59257f 100644
--- a/src/corelib/tools/qarraydata.h
+++ b/src/corelib/tools/qarraydata.h
@@ -132,7 +132,7 @@ struct QStaticArrayData
};
#define Q_STATIC_ARRAY_DATA_HEADER_INITIALIZER(type, size) { \
- Q_REFCOUNT_INITIALIZER(-1), size, 0, 0, \
+ Q_REFCOUNT_INITIALIZE_STATIC, size, 0, 0, \
(sizeof(QArrayData) + (Q_ALIGNOF(type) - 1)) \
& ~(Q_ALIGNOF(type) - 1) } \
/**/