From bccf9254d4561492705f16758061d7225703e517 Mon Sep 17 00:00:00 2001 From: greg Date: Wed, 31 Jul 2019 12:35:20 -0400 Subject: [PATCH] Update phmap_bits.h --- parallel_hashmap/phmap_bits.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/parallel_hashmap/phmap_bits.h b/parallel_hashmap/phmap_bits.h index 5ac5fac..122459c 100644 --- a/parallel_hashmap/phmap_bits.h +++ b/parallel_hashmap/phmap_bits.h @@ -337,13 +337,16 @@ PHMAP_BASE_INTERNAL_FORCEINLINE int CountTrailingZerosNonZero32(uint32_t n) { #endif #ifdef PHMAP_HAVE_INTRINSIC_INT128 + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wpedantic" inline uint64_t umul128(uint64_t a, uint64_t b, uint64_t* high) { - auto result = static_cast(a) * - static_cast(b); + auto result = static_cast(a) * + static_cast(b); *high = static_cast(result >> 64); return static_cast(result); } + #pragma GCC diagnostic pop #define PHMAP_HAS_UMUL128 1 #elif (defined(_MSC_VER)) #if defined(_M_X64)