From 7473cdf184301d9985665e53081ca219d2d2eeba Mon Sep 17 00:00:00 2001 From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> Date: Mon, 9 Sep 2019 13:46:46 +0200 Subject: [PATCH] Removed disabling of msvc warning to prevent generating a unknown option for other compilers in turn. Now detect specifically GCC in ifdef Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> --- src/common/c_jhash.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/c_jhash.h b/src/common/c_jhash.h index 44043361a..97decf998 100644 --- a/src/common/c_jhash.h +++ b/src/common/c_jhash.h @@ -207,10 +207,10 @@ static inline uint64_t c_jhash64(const uint8_t *k, uint64_t length, uint64_t int /* handle the last 23 bytes */ c += length; switch(len) { -#pragma warning(push) -#pragma warning(disable:4068) +// pragma only for GCC (and clang continues to pretend to be it by defining __GNUC__) +#if defined(__GNUC__) && !defined(__clang__) #pragma GCC diagnostic ignored "-Wimplicit-fallthrough" -#pragma warning(pop) +#endif case 23: c+=((uint64_t)k[22]<<56); case 22: c+=((uint64_t)k[21]<<48); case 21: c+=((uint64_t)k[20]<<40); -- 2.30.2