diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@nokia.com> | 2012-04-24 14:22:59 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-04 17:57:46 +0200 |
| commit | a42d8bcce18dd95d0318cf1d2088daa46b98a73d (patch) | |
| tree | 1830d2900446d4494bdd55632d1907d6acb00e7b | |
| parent | dcdd837a5699a840036f3a0a760e05ff552d2193 (diff) | |
Reuse QArray initializer macro in QByteArray
Change-Id: Ieb12ee290846dce88f2ea9fbf943103899337e0f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/corelib/tools/qarraydata.h | 11 | ||||
| -rw-r--r-- | src/corelib/tools/qbytearray.h | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/corelib/tools/qarraydata.h b/src/corelib/tools/qarraydata.h index 4d79c92cec..b038e855ac 100644 --- a/src/corelib/tools/qarraydata.h +++ b/src/corelib/tools/qarraydata.h @@ -195,10 +195,13 @@ struct QArrayDataPointerRef QTypedArrayData<T> *ptr; }; -#define Q_STATIC_ARRAY_DATA_HEADER_INITIALIZER(type, size) { \ - Q_REFCOUNT_INITIALIZE_STATIC, size, 0, 0, \ - (sizeof(QArrayData) + (Q_ALIGNOF(type) - 1)) \ - & ~(Q_ALIGNOF(type) - 1) } \ +#define Q_STATIC_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(size, offset) \ + { Q_REFCOUNT_INITIALIZE_STATIC, size, 0, 0, offset } \ + /**/ + +#define Q_STATIC_ARRAY_DATA_HEADER_INITIALIZER(type, size) \ + Q_STATIC_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(size,\ + (sizeof(QArrayData) + (Q_ALIGNOF(type) - 1) & ~(Q_ALIGNOF(type) - 1) )) \ /**/ //////////////////////////////////////////////////////////////////////////////// diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h index 6d4c155c07..79a7377c40 100644 --- a/src/corelib/tools/qbytearray.h +++ b/src/corelib/tools/qbytearray.h @@ -140,7 +140,7 @@ struct QByteArrayDataPtr }; #define Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(size, offset) \ - { Q_REFCOUNT_INITIALIZE_STATIC, size, 0, 0, offset } \ + Q_STATIC_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(size, offset) /**/ #define Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER(size) \ |