diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-06-30 19:30:49 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-06-30 20:57:13 -0700 |
| commit | aa4df026d44bd205f8bfce8a3b8d6a1144332f32 (patch) | |
| tree | 397692da57b2be8f7c083989ed37fb03308d5b2c /src/ints | |
| parent | 7c5c2058e9aea996dc6c76a7e6d9ba4fc2a2bc77 (diff) | |
| download | tmwa-aa4df026d44bd205f8bfce8a3b8d6a1144332f32.tar.gz tmwa-aa4df026d44bd205f8bfce8a3b8d6a1144332f32.tar.bz2 tmwa-aa4df026d44bd205f8bfce8a3b8d6a1144332f32.tar.xz tmwa-aa4df026d44bd205f8bfce8a3b8d6a1144332f32.zip | |
Finally get around to decoupling the warning system
Diffstat (limited to 'src/ints')
| -rw-r--r-- | src/ints/cmp.hpp | 6 | ||||
| -rw-r--r-- | src/ints/cmp_test.cpp | 2 | ||||
| -rw-r--r-- | src/ints/udl_test.cpp | 7 |
3 files changed, 6 insertions, 9 deletions
diff --git a/src/ints/cmp.hpp b/src/ints/cmp.hpp index 16384e6..58a33b4 100644 --- a/src/ints/cmp.hpp +++ b/src/ints/cmp.hpp @@ -27,8 +27,8 @@ namespace tmwa { namespace ints { -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wtype-limits" + DIAG_PUSH(); + DIAG_I(type_limits); template<class T, class U> T saturate(const U& v) { @@ -62,7 +62,7 @@ namespace ints return v; } } -#pragma GCC diagnostic pop + DIAG_POP(); } // namespace ints using ints::saturate; diff --git a/src/ints/cmp_test.cpp b/src/ints/cmp_test.cpp index be99544..5c605c0 100644 --- a/src/ints/cmp_test.cpp +++ b/src/ints/cmp_test.cpp @@ -27,8 +27,6 @@ namespace tmwa { -#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant" - // Google Test is *really* slow to compile this file #undef EXPECT_EQ #define EXPECT_EQ(a, b) assert(a == b) diff --git a/src/ints/udl_test.cpp b/src/ints/udl_test.cpp index b3ad30d..3fa9c31 100644 --- a/src/ints/udl_test.cpp +++ b/src/ints/udl_test.cpp @@ -27,10 +27,9 @@ namespace tmwa { -#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant" +DIAG_PUSH(); +DIAG_I(unused_variable); -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-variable" TEST(ints, smc) { { @@ -476,7 +475,7 @@ TEST(ints, smc) //ints::SignedMagnitudeConstant<true, 0x10000000000000000> i; } } -#pragma GCC diagnostic pop +DIAG_POP(); TEST(ints, constant) { |