diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-12-10 13:51:40 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-12-10 13:51:40 +0200 |
| commit | 90210d5d9c4029057035019f144212922494ff0a (patch) | |
| tree | 1aacefa57786964d47a200791280ae91c9b825da /src/corelib/global/qendian.h | |
| parent | c69a2448ab129d88411a4778f2350dcf971dc623 (diff) | |
| parent | 5231c26a82a7056f98d99643850754d4e1ebe417 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
tests/auto/network/kernel/qnetworkinterface/BLACKLIST
Change-Id: I1e8866c63b54bcd95fc2a044276ee15b7f60e79a
Diffstat (limited to 'src/corelib/global/qendian.h')
| -rw-r--r-- | src/corelib/global/qendian.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h index 5cd9d3160b..257efbbdbe 100644 --- a/src/corelib/global/qendian.h +++ b/src/corelib/global/qendian.h @@ -66,7 +66,7 @@ template <typename T> Q_ALWAYS_INLINE void qToUnaligned(const T src, void *dest) // Using sizeof(T) inside memcpy function produces internal compiler error with // MSVC2008/ARM in tst_endian -> use extra indirection to resolve size of T. const size_t size = sizeof(T); -#if QT_HAS_BUILTIN(__builtin_memcpy) +#if __has_builtin(__builtin_memcpy) __builtin_memcpy #else memcpy @@ -78,7 +78,7 @@ template <typename T> Q_ALWAYS_INLINE T qFromUnaligned(const void *src) { T dest; const size_t size = sizeof(T); -#if QT_HAS_BUILTIN(__builtin_memcpy) +#if __has_builtin(__builtin_memcpy) __builtin_memcpy #else memcpy |