1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "qarraydata.h: use __has_builtin directly"

Browse Source
This commit is contained in:
Fabian Kosmale 2021-03-20 19:23:53 +01:00 committed by Qt CI Bot
commit 5da3f1e4b6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -139,7 +139,7 @@ struct QTypedArrayData
static_assert(sizeof(QTypedArrayData) == sizeof(QArrayData)); static_assert(sizeof(QTypedArrayData) == sizeof(QArrayData));
QArrayData *d; QArrayData *d;
void *result = QArrayData::allocate(&d, sizeof(T), alignof(AlignmentDummy), capacity, option); void *result = QArrayData::allocate(&d, sizeof(T), alignof(AlignmentDummy), capacity, option);
#if (defined(Q_CC_GNU) && Q_CC_GNU >= 407) || QT_HAS_BUILTIN(__builtin_assume_aligned) #if __has_builtin(__builtin_assume_aligned)
result = __builtin_assume_aligned(result, Q_ALIGNOF(AlignmentDummy)); result = __builtin_assume_aligned(result, Q_ALIGNOF(AlignmentDummy));
#endif #endif
return qMakePair(static_cast<QTypedArrayData *>(d), static_cast<T *>(result)); return qMakePair(static_cast<QTypedArrayData *>(d), static_cast<T *>(result));