From c3864a1acb1d3ad3cd3b3ba1638aa909b214826e Mon Sep 17 00:00:00 2001 From: Lynix Date: Wed, 25 Feb 2015 17:40:07 +0100 Subject: [PATCH] Fixed HashCombine function under 32bits compilation Former-commit-id: 2224a17279f057a922b67cb91b03823d033c51ec --- include/Nazara/Core/Algorithm.inl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/Nazara/Core/Algorithm.inl b/include/Nazara/Core/Algorithm.inl index fa1a388ab..1fa2a9032 100644 --- a/include/Nazara/Core/Algorithm.inl +++ b/include/Nazara/Core/Algorithm.inl @@ -35,16 +35,16 @@ struct NzImplTupleUnpack<0> template void NzHashCombine(std::size_t& seed, const T& v) { - const std::size_t kMul = 0x9ddfea08eb382d69ULL; + const nzUInt64 kMul = 0x9ddfea08eb382d69ULL; std::hash hasher; - std::size_t a = (hasher(v) ^ seed) * kMul; + nzUInt64 a = (hasher(v) ^ seed) * kMul; a ^= (a >> 47); - std::size_t b = (seed ^ a) * kMul; + nzUInt64 b = (seed ^ a) * kMul; b ^= (b >> 47); - seed = b * kMul; + seed = static_cast(b * kMul); } template