diff options
Diffstat (limited to 'util')
| -rw-r--r-- | util/glgen/qopenglversionfunctions.h.header | 2 | ||||
| -rw-r--r-- | util/glgen/specparser.h | 4 | ||||
| -rw-r--r-- | util/lexgen/nfa.cpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/util/glgen/qopenglversionfunctions.h.header b/util/glgen/qopenglversionfunctions.h.header index 3e57bf0277..951d09c1d1 100644 --- a/util/glgen/qopenglversionfunctions.h.header +++ b/util/glgen/qopenglversionfunctions.h.header @@ -78,7 +78,7 @@ struct QOpenGLVersionStatus OpenGLStatus status; }; -inline uint qHash(const QOpenGLVersionStatus &v, uint seed) +inline size_t qHash(const QOpenGLVersionStatus &v, size_t seed) { return qHash(static_cast<int>(v.status * 1000) + v.version.first * 100 + v.version.second * 10, seed); diff --git a/util/glgen/specparser.h b/util/glgen/specparser.h index 7fee5c4df9..38051f9f43 100644 --- a/util/glgen/specparser.h +++ b/util/glgen/specparser.h @@ -77,7 +77,7 @@ inline bool operator <= (const Version &lhs, const Version &rhs) return !(lhs > rhs); } -inline uint qHash(const Version &v) +inline size_t qHash(const Version &v) { return qHash(v.major * 100 + v.minor * 10); } @@ -118,7 +118,7 @@ inline bool operator < (const VersionProfile &lhs, const VersionProfile &rhs) return (lhs.version < rhs.version); } -inline uint qHash(const VersionProfile &v) +inline size_t Hash(const VersionProfile &v) { return qHash(static_cast<int>(v.profile * 1000) + v.version.major * 100 + v.version.minor * 10); } diff --git a/util/lexgen/nfa.cpp b/util/lexgen/nfa.cpp index f6e3a5c355..b5c91c5cff 100644 --- a/util/lexgen/nfa.cpp +++ b/util/lexgen/nfa.cpp @@ -236,11 +236,11 @@ typedef QSet<int> DFAState; // that's a bad hash, but it's good enough for us // and it allows us to use the nice QHash API :) -inline uint qHash(const DFAState &state) +inline size_t qHash(const DFAState &state) { - uint val = 0; + size_t val = 0; foreach (int s, state) - val |= qHash(s); + val ^= qHash(s); return val; } |