diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-02-04 11:40:27 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-02-04 11:40:27 (GMT) |
| commit | 7b46aa91709fd7df0ca791d63f68ee5a9436d50a (patch) | |
| tree | fd10fd74d729124d6ef4099f6fe933e3ad9fa9ab /src/corelib/tools/qhash.cpp | |
| parent | 4cd8dd562ea149d5a6cdcc15533e4975682106f6 (diff) | |
| parent | 3569038ffec0c133ff29f80d506f334cc0f2ddb3 (diff) | |
| download | Qt-7b46aa91709fd7df0ca791d63f68ee5a9436d50a.zip Qt-7b46aa91709fd7df0ca791d63f68ee5a9436d50a.tar.gz Qt-7b46aa91709fd7df0ca791d63f68ee5a9436d50a.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Diffstat (limited to 'src/corelib/tools/qhash.cpp')
| -rw-r--r-- | src/corelib/tools/qhash.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp index d758325..6231471 100644 --- a/src/corelib/tools/qhash.cpp +++ b/src/corelib/tools/qhash.cpp @@ -68,8 +68,8 @@ static uint hash(const uchar *p, int n) while (n--) { h = (h << 4) + *p++; - if ((g = (h & 0xf0000000)) != 0) - h ^= g >> 23; + g = h & 0xf0000000; + h ^= g >> 23; h &= ~g; } return h; @@ -82,8 +82,8 @@ static uint hash(const QChar *p, int n) while (n--) { h = (h << 4) + (*p++).unicode(); - if ((g = (h & 0xf0000000)) != 0) - h ^= g >> 23; + g = h & 0xf0000000; + h ^= g >> 23; h &= ~g; } return h; |