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

Fix compilation of qendian's qswap specializations on gcc 4.8

Browse Source 
Task-number: QTBUG-71945
Change-Id: Icf2b75c72946f57ebffc880c9238531dea13ab5b
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Ville Voutilainen 2018-11-21 14:07:18 +02:00
parent 6b875f0625
commit 1eeebae7e3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/corelib/global/qendian.h
View File

@ -162,17 +162,17 @@ Float qbswapFloatHelper(Float source)
return qFromUnaligned<Float>(&temp); return qFromUnaligned<Float>(&temp);
} }
template <> inline qfloat16 qbswap<qfloat16>(qfloat16 source) inline qfloat16 qbswap(qfloat16 source)
{ {
return qbswapFloatHelper(source); return qbswapFloatHelper(source);
} }
template <> inline float qbswap<float>(float source) inline float qbswap(float source)
{ {
return qbswapFloatHelper(source); return qbswapFloatHelper(source);
} }
template <> inline double qbswap<double>(double source) inline double qbswap(double source)
{ {
return qbswapFloatHelper(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) 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; 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 #else // Q_LITTLE_ENDIAN
template <typename T> inline Q_DECL_CONSTEXPR T qToBigEndian(T source) 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) 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) template <typename T> inline Q_DECL_CONSTEXPR T qToLittleEndian(T source)
{ return source; } { return source; }
template <typename T> inline Q_DECL_CONSTEXPR T qFromLittleEndian(T source) template <typename T> inline Q_DECL_CONSTEXPR T qFromLittleEndian(T source)