diff options
author | Liang Qi <liang.qi@qt.io> | 2018-12-04 09:58:43 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-12-04 09:58:43 +0100 |
commit | 5d5c00c67682bce105197b659687fd1fee8f60cf (patch) | |
tree | 686e41dc3ea121235fb73afb9157ed603f1bfeff /src/corelib/global/qendian.h | |
parent | f213e818f03d35cb82e3daf187415197fd156f8e (diff) | |
parent | b82559244e2dc03f1ceff66bb67630df4300dc7c (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/gui/painting/qdrawhelper.cpp
Change-Id: I4916e07b635e1d3830e9b46ef7914f99bec3098e
Diffstat (limited to 'src/corelib/global/qendian.h')
-rw-r--r-- | src/corelib/global/qendian.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h index 0e67a1ab8e..f2e5833468 100644 --- a/src/corelib/global/qendian.h +++ b/src/corelib/global/qendian.h @@ -162,17 +162,17 @@ Float qbswapFloatHelper(Float source) return qFromUnaligned<Float>(&temp); } -template <> inline qfloat16 qbswap<qfloat16>(qfloat16 source) +inline qfloat16 qbswap(qfloat16 source) { return qbswapFloatHelper(source); } -template <> inline float qbswap<float>(float source) +inline float qbswap(float source) { return qbswapFloatHelper(source); } -template <> inline double qbswap<double>(double source) +inline double qbswap(double source) { return qbswapFloatHelper(source); } @@ -185,7 +185,7 @@ template <> inline double qbswap<double>(double source) */ template <typename T> inline void qbswap(const T src, void *dest) { - qToUnaligned<T>(qbswap<T>(src), dest); + qToUnaligned<T>(qbswap(src), dest); } template <int Size> void *qbswap(const void *source, qsizetype count, void *dest) noexcept; @@ -223,9 +223,9 @@ template <typename T> inline void qFromLittleEndian(const void *source, qsizetyp #else // Q_LITTLE_ENDIAN template <typename T> inline Q_DECL_CONSTEXPR T qToBigEndian(T source) -{ return qbswap<T>(source); } +{ return qbswap(source); } template <typename T> inline Q_DECL_CONSTEXPR T qFromBigEndian(T source) -{ return qbswap<T>(source); } +{ return qbswap(source); } template <typename T> inline Q_DECL_CONSTEXPR T qToLittleEndian(T source) { return source; } template <typename T> inline Q_DECL_CONSTEXPR T qFromLittleEndian(T source) |