diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase/0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch b/recipes-qt/qt5/qtbase/0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch new file mode 100644 index 00000000..21e3207d --- /dev/null +++ b/recipes-qt/qt5/qtbase/0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch @@ -0,0 +1,59 @@ +From 4bcd7b1c6e06cfaef1a52795df007f1a9372eeed Mon Sep 17 00:00:00 2001 +From: Ville Voutilainen <ville.voutilainen@qt.io> +Date: Wed, 21 Nov 2018 14:07:18 +0200 +Subject: [PATCH] Fix compilation of qendian's qswap specializations on gcc 4.8 + +Task-number: QTBUG-71945 +Change-Id: Icf2b75c72946f57ebffc880c9238531dea13ab5b +Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> +Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> +--- + src/corelib/global/qendian.h | 12 ++++++------ + 1 file 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) |