int128: Compile with -Wpedantic

chfast · May 23, 2019 · cd0b7ea · cd0b7ea
1 parent 50a3f4e
commit cd0b7ea
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -24,7 +24,7 @@ include(Hunter/init)
 project(intx LANGUAGES CXX)
 set(PROJECT_VERSION 0.3.0-dev)
 
-cable_configure_compiler(NO_PEDANTIC NO_CONVERSION_WARNINGS NO_STACK_PROTECTION)
+cable_configure_compiler(NO_CONVERSION_WARNINGS NO_STACK_PROTECTION)
 
 if(INTX_TESTING)
     enable_testing()

diff --git a/include/intx/int128.hpp b/include/intx/int128.hpp
@@ -45,14 +45,17 @@ struct uint<128>
     {}
 
 #ifdef __SIZEOF_INT128__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpedantic"
     constexpr uint(unsigned __int128 x) noexcept  // NOLINT
       : lo{uint64_t(x)}, hi{uint64_t(x >> 64)}
     {}
 
     constexpr explicit operator unsigned __int128() const noexcept
     {
-        return ((unsigned __int128){hi} << 64) | lo;
+        return (static_cast<unsigned __int128>(hi) << 64) | lo;
     }
+#pragma GCC diagnostic pop
 #endif
 
     constexpr explicit operator bool() const noexcept { return hi | lo; }
@@ -287,8 +290,11 @@ constexpr uint128 constexpr_umul(uint64_t x, uint64_t y) noexcept
 inline uint128 umul(uint64_t x, uint64_t y) noexcept
 {
 #if defined(__SIZEOF_INT128__)
-    const auto p = (unsigned __int128){x} * y;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpedantic"
+    const auto p = static_cast<unsigned __int128>(x) * y;
     return {uint64_t(p >> 64), uint64_t(p)};
+#pragma GCC diagnostic pop
 #elif defined(_MSC_VER)
     unsigned __int64 hi;
     const auto lo = _umul128(x, y, &hi);

diff --git a/test/benchmarks/utils.cpp b/test/benchmarks/utils.cpp
@@ -7,6 +7,7 @@
 #include <cstdint>
 #include <cstring>
 
+#pragma GCC diagnostic ignored "-Wpedantic"
 
 uint64_t udiv_native(uint64_t x, uint64_t y) noexcept
 {

diff --git a/test/unittests/test_int128.cpp b/test/unittests/test_int128.cpp
@@ -294,6 +294,9 @@ TEST(int128, div)
 }
 
 #ifdef __SIZEOF_INT128__
+#pragma GCC diagnostic ignored "-Wpedantic"
+using uint128_ty = unsigned __int128;
+
 TEST(int128, arith_random_args)
 {
     int c = 1000000;
@@ -311,11 +314,11 @@ TEST(int128, arith_random_args)
         auto q = x / y;
         auto r = x % y;
 
-        auto expected_s = uint128{(unsigned __int128){x} + (unsigned __int128){y}};
-        auto expected_d = uint128{(unsigned __int128){x} - (unsigned __int128){y}};
-        auto expected_p = uint128{(unsigned __int128){x} * (unsigned __int128){y}};
-        auto expected_q = uint128{(unsigned __int128){x} / (unsigned __int128){y}};
-        auto expected_r = uint128{(unsigned __int128){x} % (unsigned __int128){y}};
+        auto expected_s = uint128{uint128_ty{x} + uint128_ty{y}};
+        auto expected_d = uint128{uint128_ty{x} - uint128_ty{y}};
+        auto expected_p = uint128{uint128_ty{x} * uint128_ty{y}};
+        auto expected_q = uint128{uint128_ty{x} / uint128_ty{y}};
+        auto expected_r = uint128{uint128_ty{x} % uint128_ty{y}};
 
         EXPECT_EQ(s, expected_s) << c;
         EXPECT_EQ(d, expected_d) << c;

diff --git a/test/utils/gmp.hpp b/test/utils/gmp.hpp
@@ -52,7 +52,7 @@ inline div_result<Int> udivrem(const Int& x, const Int& y) noexcept
     auto p_y = (mp_srcptr)&y;
     mpn_tdiv_qr(p_q, p_r, 0, p_x, x_limbs, p_y, y_limbs);
     return {q, r};
-};
+}
 
 template <typename Int>
 inline div_result<Int> sdivrem(const Int& x, const Int& y) noexcept
@@ -98,7 +98,7 @@ inline div_result<Int> sdivrem(const Int& x, const Int& y) noexcept
     mpz_clears(x_gmp, y_gmp, q_gmp, r_gmp, NULL);
 
     return {q, r};
-};
+}
 
 template <typename Int>
 inline Int add(const Int& x, const Int& y) noexcept