diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-02-07 23:53:17 (GMT) |
|---|---|---|
| committer | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-02-07 23:53:17 (GMT) |
| commit | ac33de5bf257eb215a09c232d950be265d57d22f (patch) | |
| tree | 3947891872c1a41deaa32e8995e2e233548b3352 /src/corelib/tools/qhash.cpp | |
| parent | 3108f02f35685bd57486e198277c600e09d98b13 (diff) | |
| parent | 8ca95cbc98a97a8208120e4aa76bfd5c16b01df9 (diff) | |
| download | Qt-ac33de5bf257eb215a09c232d950be265d57d22f.zip Qt-ac33de5bf257eb215a09c232d950be265d57d22f.tar.gz Qt-ac33de5bf257eb215a09c232d950be265d57d22f.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team 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; |