From b4d023503b40b45fd11835f1697a17e23f958af3 Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Thu, 1 Mar 2012 21:45:51 +0000 Subject: [PATCH] Fix two warnings in this code that I missed. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@151839 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/ADT/Hashing.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/llvm/ADT/Hashing.h b/include/llvm/ADT/Hashing.h index ccf352cb52b..e5969a3c05a 100644 --- a/include/llvm/ADT/Hashing.h +++ b/include/llvm/ADT/Hashing.h @@ -219,7 +219,7 @@ inline uint64_t hash_33to64_bytes(const char *s, size_t len, uint64_t seed) { uint64_t wf = a + z; uint64_t ws = b + rotate(a, 31) + c; uint64_t r = shift_mix((vf + ws) * k2 + (wf + vs) * k0); - return shift_mix(seed ^ (r * k0) + vs) * k2; + return shift_mix((seed ^ (r * k0)) + vs) * k2; } inline uint64_t hash_short(const char *s, size_t length, uint64_t seed) { @@ -325,8 +325,9 @@ inline size_t get_execution_seed() { // // However, if there is a fixed seed override set the first time this is // called, return that instead of the per-execution seed. + const uint64_t seed_prime = 0xff51afd7ed558ccdULL; static size_t seed = fixed_seed_override ? fixed_seed_override - : 0xff51afd7ed558ccdULL; + : static_cast(seed_prime); return seed; }