diff options
| -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) \ |