Skip to content

Address MSVC 64-bit compile warnings. #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Address MSVC 64-bit compile warnings. #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/city.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ static uint32 Hash32Len13to24(const char *s, size_t len) {
uint32 d = Fetch32(s + (len >> 1));
uint32 e = Fetch32(s);
uint32 f = Fetch32(s + len - 4);
uint32 h = len;
uint32 h = static_cast<uint32>(len);

return fmix(Mur(f, Mur(e, Mur(d, Mur(c, Mur(b, Mur(a, h)))))));
}
Expand All @@ -175,11 +175,11 @@ static uint32 Hash32Len0to4(const char *s, size_t len) {
b = b * c1 + v;
c ^= b;
}
return fmix(Mur(b, Mur(len, c)));
return fmix(Mur(b, Mur(static_cast<uint32>(len), c)));
}

static uint32 Hash32Len5to12(const char *s, size_t len) {
uint32 a = len, b = len * 5, c = 9, d = b;
uint32 a = static_cast<uint32>(len), b = a * 5, c = 9, d = b;
a += Fetch32(s);
b += Fetch32(s + len - 4);
c += Fetch32(s + ((len >> 1) & 4));
Expand All @@ -194,7 +194,7 @@ uint32 CityHash32(const char *s, size_t len) {
}

// len > 24
uint32 h = len, g = c1 * len, f = g;
uint32 h = static_cast<uint32>(len), g = c1 * h, f = g;
uint32 a0 = Rotate32(Fetch32(s + len - 4) * c1, 17) * c2;
uint32 a1 = Rotate32(Fetch32(s + len - 8) * c1, 17) * c2;
uint32 a2 = Rotate32(Fetch32(s + len - 16) * c1, 17) * c2;
Expand Down Expand Up @@ -299,7 +299,7 @@ static uint64 HashLen0to16(const char *s, size_t len) {
uint8 b = s[len >> 1];
uint8 c = s[len - 1];
uint32 y = static_cast<uint32>(a) + (static_cast<uint32>(b) << 8);
uint32 z = len + (static_cast<uint32>(c) << 2);
uint32 z = static_cast<uint32>(len) + (static_cast<uint32>(c) << 2);
return ShiftMix(y * k2 ^ z * k0) * k2;
}
return k2;
Expand Down Expand Up @@ -417,7 +417,7 @@ static uint128 CityMurmur(const char *s, size_t len, uint128 seed) {
uint64 b = Uint128High64(seed);
uint64 c = 0;
uint64 d = 0;
signed long l = len - 16;
signed long l = static_cast<long>(len) - 16;
if (l <= 0) { // len <= 16
a = ShiftMix(a * k1) * k1;
c = b * k1 + HashLen0to16(s, len);
Expand Down