diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-11-04 11:51:12 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-11-04 11:51:12 (GMT) |
| commit | 202dee4e4840ef899edcb638fabc28b281e7a2dd (patch) | |
| tree | d4a250d7859fb7633b858567c4fe95472d5b7b21 /src/corelib/tools/qmap.h | |
| parent | 2747f200ce27599af74f01cb629ec8930bae7b44 (diff) | |
| download | Qt-202dee4e4840ef899edcb638fabc28b281e7a2dd.zip Qt-202dee4e4840ef899edcb638fabc28b281e7a2dd.tar.gz Qt-202dee4e4840ef899edcb638fabc28b281e7a2dd.tar.bz2 | |
Avoid warning on 64 bit systems
Diffstat (limited to 'src/corelib/tools/qmap.h')
| -rw-r--r-- | src/corelib/tools/qmap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qmap.h b/src/corelib/tools/qmap.h index 65c3d2a..0441107 100644 --- a/src/corelib/tools/qmap.h +++ b/src/corelib/tools/qmap.h @@ -151,7 +151,7 @@ class QMap static inline int payload() { return sizeof(PayloadNode) - sizeof(QMapData::Node *); } static inline int alignment() { #ifdef Q_ALIGNOF - return qMax(sizeof(void*), Q_ALIGNOF(Node)); + return int(qMax(sizeof(void*), Q_ALIGNOF(Node))); #else return 0; #endif |