Changeset 769 for trunk/src/corelib/tools/qhash.cpp

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/tools/qhash.cpp (modified) (2 diffs)

trunk/src/corelib/tools/qhash.cpp

@@ -69 +69 @@
     while (n--) {
         h = (h << 4) + *p++;
-        if ((g = (h & 0xf0000000)) != 0)
-            h ^= g >> 23;
+        
+        h ^= g >> 23;
         h &= ~g;
     }
@@ -83 +83 @@
     while (n--) {
         h = (h << 4) + (*p++).unicode();
-        if ((g = (h & 0xf0000000)) != 0)
-            h ^= g >> 23;
+        
+        h ^= g >> 23;
         h &= ~g;
     }