summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-08-14 12:30:01 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-08-14 12:30:01 (GMT)
commit8d846a525a67f2b0b680ed836601712a5250ce57 (patch)
tree34fef9650992717f5d4274d8c578419ac0475698 /src/corelib/global
parent4c31f59d45130eae8f140e6d0177a4b227454187 (diff)
parentb770651f19741907cd415ea9ad6e087cb32cc948 (diff)
downloadQt-8d846a525a67f2b0b680ed836601712a5250ce57.zip
Qt-8d846a525a67f2b0b680ed836601712a5250ce57.tar.gz
Qt-8d846a525a67f2b0b680ed836601712a5250ce57.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend
Diffstat (limited to 'src/corelib/global')
-rw-r--r--src/corelib/global/qglobal.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 7076a1e..5a2c329 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -848,6 +848,8 @@ typedef quint64 qulonglong;
&& sizeof(void *) == sizeof(qptrdiff)
*/
template <int> struct QIntegerForSize;
+template <> struct QIntegerForSize<1> { typedef quint8 Unsigned; typedef qint8 Signed; };
+template <> struct QIntegerForSize<2> { typedef quint16 Unsigned; typedef qint16 Signed; };
template <> struct QIntegerForSize<4> { typedef quint32 Unsigned; typedef qint32 Signed; };
template <> struct QIntegerForSize<8> { typedef quint64 Unsigned; typedef qint64 Signed; };
template <class T> struct QIntegerForSizeof: QIntegerForSize<sizeof(T)> { };