From 1cc5fee5904832da6564f12c858423fd5bd1b2b6 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Tue, 22 Apr 2014 17:14:28 -0700 Subject: Make travis happy --- src/ints/cmp.hpp | 3 + src/ints/udl.hpp | 2 +- src/ints/udl_test.cpp | 584 +++++++++++++++++++++++++------------------------- src/ints/wrap.hpp | 10 +- 4 files changed, 301 insertions(+), 298 deletions(-) (limited to 'src/ints') diff --git a/src/ints/cmp.hpp b/src/ints/cmp.hpp index e0e819b..de6a5f2 100644 --- a/src/ints/cmp.hpp +++ b/src/ints/cmp.hpp @@ -25,6 +25,8 @@ namespace ints { +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wtype-limits" template T saturate(const U& v) { @@ -58,6 +60,7 @@ namespace ints return v; } } +# pragma GCC diagnostic pop } // namespace ints using ints::saturate; diff --git a/src/ints/udl.hpp b/src/ints/udl.hpp index ecb5478..caed16b 100644 --- a/src/ints/udl.hpp +++ b/src/ints/udl.hpp @@ -122,7 +122,7 @@ namespace ints template constexpr - operator T() + operator T() const { typedef typename std::make_unsigned::type U; // boo, body of constexpr function can't use variables diff --git a/src/ints/udl_test.cpp b/src/ints/udl_test.cpp index 3bcbaad..acb4f76 100644 --- a/src/ints/udl_test.cpp +++ b/src/ints/udl_test.cpp @@ -30,439 +30,439 @@ TEST(ints, smc) { { ints::SignedMagnitudeConstant i; - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); - //static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); - //static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); - //static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - //static_cast(i); - static_cast(i); - static_cast(i); - //static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - //static_cast(i); - static_cast(i); - static_cast(i); - //static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - //static_cast(i); - static_cast(i); - static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - //static_cast(i); - static_cast(i); - static_cast(i); - //static_cast(i); - static_cast(i); - static_cast(i); - static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - //static_cast(i); - static_cast(i); - static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - //static_cast(i); - static_cast(i); - static_cast(i); - //static_cast(i); - //static_cast(i); - static_cast(i); - static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - //static_cast(i); - static_cast(i); - static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - //static_cast(i); - static_cast(i); - static_cast(i); - //static_cast(i); - //static_cast(i); - static_cast(i); - static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - //static_cast(i); - static_cast(i); - static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - //static_cast(i); - static_cast(i); - static_cast(i); - //static_cast(i); - //static_cast(i); - static_cast(i); - static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - //static_cast(i); - static_cast(i); - static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - //static_cast(i); - //static_cast(i); - static_cast(i); - //static_cast(i); - //static_cast(i); - static_cast(i); - static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - //static_cast(i); - static_cast(i); - static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - //static_cast(i); - //static_cast(i); - static_cast(i); - //static_cast(i); - //static_cast(i); - static_cast(i); - static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - //static_cast(i); - //static_cast(i); - static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - //static_cast(i); - //static_cast(i); - static_cast(i); - //static_cast(i); - //static_cast(i); - static_cast(i); - static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - //static_cast(i); - //static_cast(i); - static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - //static_cast(i); - //static_cast(i); - static_cast(i); - //static_cast(i); - //static_cast(i); - //static_cast(i); - static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - //static_cast(i); - //static_cast(i); - static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - //static_cast(i); - //static_cast(i); - static_cast(i); - //static_cast(i); - //static_cast(i); - //static_cast(i); - static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - //static_cast(i); - //static_cast(i); - static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - //static_cast(i); - //static_cast(i); - static_cast(i); - //static_cast(i); - //static_cast(i); - //static_cast(i); - static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - //static_cast(i); - //static_cast(i); - static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - //static_cast(i); - //static_cast(i); - //static_cast(i); - //static_cast(i); - //static_cast(i); - //static_cast(i); - static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - //static_cast(i); - //static_cast(i); - static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - //static_cast(i); - //static_cast(i); - //static_cast(i); - //static_cast(i); - //static_cast(i); - //static_cast(i); - static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - //static_cast(i); - //static_cast(i); - //static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - //static_cast(i); - //static_cast(i); - //static_cast(i); - //static_cast(i); - //static_cast(i); - //static_cast(i); - static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + (void)static_cast(i); } { ints::SignedMagnitudeConstant i; - //static_cast(i); - //static_cast(i); - //static_cast(i); - //static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); + //(void)static_cast(i); } { //ints::SignedMagnitudeConstant i; diff --git a/src/ints/wrap.hpp b/src/ints/wrap.hpp index b25a1ad..71f2673 100644 --- a/src/ints/wrap.hpp +++ b/src/ints/wrap.hpp @@ -45,17 +45,17 @@ namespace ints bool operator !() const { return !_value; } }; - template + template bool operator == (W l, W r) { return l._value == r._value; } - template + template bool operator != (W l, W r) { return l._value != r._value; } - template + template bool operator < (W l, W r) { return l._value < r._value; @@ -74,8 +74,8 @@ namespace ints struct Sub : T { constexpr - Sub(typename T::wrapped_type v) - : T(v) + Sub(typename T::wrapped_type v2) + : T(v2) {} }; return Sub(v); -- cgit v1.2.3-70-g09d2