From 03d990fa157abbb5f7554a1e3c6404cf4d82f307 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 19 Feb 2020 10:00:34 +0100 Subject: [PATCH] Fix compiler warning on 32bit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8728ba339161e210772e73c633cb2309dfb01b8e Reviewed-by: Thiago Macieira Reviewed-by: Mårten Nordheim --- src/corelib/tools/qhashfunctions.h | 13 +++++++------ 1 file 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); } }