diff options
| author | Liang Qi <liang.qi@nokia.com> | 2011-05-23 09:27:23 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-27 13:21:39 +0200 |
| commit | fb214079bda2122878466db510fc7549065c3ae3 (patch) | |
| tree | 2cfb47277577b073e837bd4485ab6cc5f8706bce | |
| parent | 4ace7475e7862bbe03e0d993f4675147ed28c972 (diff) | |
Fix the build for QUuid
Add a quint8 specialization for qbswap.
Reviewed-by: Bradley T. Hughes
(cherry picked from commit 32a583b575da1b387955734ccf36b0a93de37670)
Change-Id: I7dae5e47565ed30de960983649e5c214e0303fe3
Reviewed-on: http://codereview.qt.nokia.com/171
Reviewed-by: Liang Qi <liang.qi@nokia.com>
| -rw-r--r-- | src/corelib/global/qendian.h | 5 | ||||
| -rw-r--r-- | src/corelib/plugin/quuid.cpp | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h index 4e3f4e312f..8a17af55f2 100644 --- a/src/corelib/global/qendian.h +++ b/src/corelib/global/qendian.h @@ -363,6 +363,11 @@ template <typename T> inline void qToLittleEndian(T src, uchar *dest) #endif // Q_BYTE_ORDER == Q_BIG_ENDIAN +template <> inline quint8 qbswap<quint8>(quint8 source) +{ + return source; +} + QT_END_NAMESPACE QT_END_HEADER diff --git a/src/corelib/plugin/quuid.cpp b/src/corelib/plugin/quuid.cpp index 7ef8522411..e99f87a86f 100644 --- a/src/corelib/plugin/quuid.cpp +++ b/src/corelib/plugin/quuid.cpp @@ -52,8 +52,7 @@ void _q_toHex(Char *&dst, Integral value) { static const char digits[] = "0123456789abcdef"; - if (sizeof(Integral) > 1) - value = qToBigEndian(value); + value = qToBigEndian(value); const char* p = reinterpret_cast<const char*>(&value); |