diff options
| author |  Sadie Powell | 2026-03-14 07:44:10 +0000 |
|---|---|---|
| committer | Sadie Powell | 2026-03-14 07:44:10 +0000 |
| commit | ef2176d9f863a7d1962eeff426d94c06b3face43 (patch) | |
| tree | b6294defa50d7a3f5d9a7e87b46a8e3e27a95eb9 /src/casemap.cpp | |
| parent | Fix a crash caused by weirdly casting a pointer to an I/O handler. (diff) | |
Silence a warning in the string hashing code.
Diffstat (limited to 'src/casemap.cpp')
| -rw-r--r-- | src/casemap.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/casemap.cpp b/src/casemap.cpp index fda4b85aa..08c6ae671 100644 --- a/src/casemap.cpp +++ b/src/casemap.cpp @@ -45,8 +45,8 @@ const insp::casemap* national_case_insensitive_map = ascii_case_insensitive_map; // insensitively using the IRC casemapping. Do not make changes to them if you // do not know what you are doing. #if SIZE_MAX == UINT64_MAX -# define MURMUR_SEED_MAX UINT64_MAX -# define MURMUR_SEED_TYPE uint64_t +# define MURMUR_NUM_MAX UINT64_MAX +# define MURMUR_NUM_TYPE uint64_t # define MURMUR_HASH MurmurHash64A static uint64_t MurmurHash64A(const void* key, int len, uint64_t seed) { @@ -108,8 +108,8 @@ static uint64_t MurmurHash64A(const void* key, int len, uint64_t seed) # if SIZE_MAX != UINT32_MAX # warning SIZE_MAX is an unknown size; falling back to 32-bit MurmurHash # endif -# define MURMUR_SEED_MAX UINT32_MAX -# define MURMUR_SEED_TYPE uint32_t +# define MURMUR_NUM_MAX UINT32_MAX +# define MURMUR_NUM_TYPE uint32_t # define MURMUR_HASH MurmurHash2A # define mmix(h,k) { k *= m; k ^= k >> r; k *= m; h *= m; h ^= k; } @@ -194,11 +194,11 @@ bool insp::casemapped_less(const std::string_view& str1, const std::string_view& size_t insp::casemapped_hash(const std::string_view& str) { static auto seed_initialized = false; - static MURMUR_SEED_TYPE seed; + static MURMUR_NUM_TYPE seed; if (!seed_initialized) [[unlikely]] { - seed = ServerInstance->GenRandomInt(MURMUR_SEED_MAX); + seed = ServerInstance->GenRandomInt(MURMUR_NUM_MAX); seed_initialized = true; } - return MURMUR_HASH(str.data(), str.length(), seed); + return MURMUR_HASH(str.data(), static_cast<MURMUR_NUM_TYPE>(str.length()), seed); } |