summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-02-19 10:00:34 +0100
committerLars Knoll <lars.knoll@qt.io>2020-04-09 20:03:39 +0200
commit03d990fa157abbb5f7554a1e3c6404cf4d82f307 (patch)
treeaffa5993f857816f0523819dd2b1880a12e8e2bf
parent0375757bfb3852ace3bf3237a7de0ed2dbb371d8 (diff)
Fix compiler warning on 32bit
Change-Id: I8728ba339161e210772e73c633cb2309dfb01b8e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
-rw-r--r--src/corelib/tools/qhashfunctions.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/corelib/tools/qhashfunctions.h b/src/corelib/tools/qhashfunctions.h
index de3a456f4b..f519925798 100644
--- a/src/corelib/tools/qhashfunctions.h
+++ b/src/corelib/tools/qhashfunctions.h
@@ -81,12 +81,13 @@ Q_DECL_CONST_FUNCTION constexpr size_t hash(size_t key, size_t seed) noexcept
key ^= key >> 16;
return key;
} else {
- key ^= key >> 32;
- key *= UINT64_C(0xd6e8feb86659fd93);
- key ^= key >> 32;
- key *= UINT64_C(0xd6e8feb86659fd93);
- key ^= key >> 32;
- return key;
+ quint64 key64 = key;
+ key64 ^= key64 >> 32;
+ key64 *= UINT64_C(0xd6e8feb86659fd93);
+ key64 ^= key64 >> 32;
+ key64 *= UINT64_C(0xd6e8feb86659fd93);
+ key64 ^= key64 >> 32;
+ return size_t(key64);
}
}