whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reuse QArray initializer macro in QByteArray 

Change-Id: Ieb12ee290846dce88f2ea9fbf943103899337e0f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Jędrzej Nowacki 2012-04-24 14:22:59 +02:00 committed by Qt by Nokia
parent dcdd837a56
commit a42d8bcce1
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/corelib/tools/qarraydata.h
View File

@ -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) )) \
/**/
////////////////////////////////////////////////////////////////////////////////

2
src/corelib/tools/qbytearray.h
View File

@ -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) \