diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-03-20 19:23:53 +0100 |
|---|---|---|
| committer | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-03-21 20:12:20 +0000 |
| commit | 5da3f1e4b6f5587558a76727c825c68904595b3c (patch) | |
| tree | 04e594849b945de6308ad4e0ba3f13cb5029c377 /src/corelib/tools/qarraydata.h | |
| parent | 3b281f66937a3a9329c7ff363b16499664c52b4e (diff) | |
| parent | 1687f4c96345b7427ec3eafff57bcc7843d7d5cf (diff) | |
Merge "qarraydata.h: use __has_builtin directly"
Diffstat (limited to 'src/corelib/tools/qarraydata.h')
| -rw-r--r-- | src/corelib/tools/qarraydata.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qarraydata.h b/src/corelib/tools/qarraydata.h index c76ff3d9f02..9f39c60f3c6 100644 --- a/src/corelib/tools/qarraydata.h +++ b/src/corelib/tools/qarraydata.h @@ -139,7 +139,7 @@ struct QTypedArrayData static_assert(sizeof(QTypedArrayData) == sizeof(QArrayData)); QArrayData *d; 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)); #endif return qMakePair(static_cast<QTypedArrayData *>(d), static_cast<T *>(result)); |