From 87a951fc5d3bd5e0672c31a02102bf0b45d08faf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 29 Aug 2018 23:50:43 +0200 Subject: [PATCH] Math: I have no idea what happened here. Even after the change I am not sure what I originally meant to do here. Discovered by PVS-Studio, thanks to @alexesDev for gathering the report. --- src/Magnum/Math/Test/TypeTraitsTest.cpp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/Magnum/Math/Test/TypeTraitsTest.cpp b/src/Magnum/Math/Test/TypeTraitsTest.cpp index 3bfcef9f2..966d93563 100644 --- a/src/Magnum/Math/Test/TypeTraitsTest.cpp +++ b/src/Magnum/Math/Test/TypeTraitsTest.cpp @@ -226,12 +226,11 @@ template void TypeTraitsTest::equalsZeroIntegral() { setTestCaseName(std::string{"equalsZeroIntegral<"} + TypeTraits::name() + ">"); const T a(-123); - const T b(-123); - const T magnitude = std::max(abs(a), abs(b)); + const T magnitude = abs(a); - CORRADE_VERIFY(TypeTraits::equals(a, b)); - CORRADE_VERIFY(TypeTraits::equalsZero(a - b, magnitude)); - CORRADE_VERIFY(!TypeTraits::equalsZero(a - b + TypeTraits::epsilon(), magnitude)); + CORRADE_VERIFY(TypeTraits::equals(a, a)); + CORRADE_VERIFY(TypeTraits::equalsZero(a - a, magnitude)); + CORRADE_VERIFY(!TypeTraits::equalsZero(a - a + TypeTraits::epsilon(), magnitude)); } template void TypeTraitsTest::equalsZeroFloatingPoint() { @@ -239,15 +238,14 @@ template void TypeTraitsTest::equalsZeroFloatingPoint() { setTestCaseDescription(EqualsZeroData[testCaseInstanceId()].name); const T a = EqualsZeroData[testCaseInstanceId()].get(T{}); - const T b = EqualsZeroData[testCaseInstanceId()].get(T{}); const T step = EqualsZeroData[testCaseInstanceId()].getStep(T{}); - const T magnitude = std::max(abs(a), abs(b)); + const T magnitude = abs(a); - CORRADE_VERIFY(TypeTraits::equals(a + step/T(2.0), b)); - CORRADE_VERIFY(TypeTraits::equalsZero(a + step/T(2.0) - b, magnitude)); + CORRADE_VERIFY(TypeTraits::equals(a + step/T(2.0), a)); + CORRADE_VERIFY(TypeTraits::equalsZero(a + step/T(2.0) - a, magnitude)); - CORRADE_VERIFY(!TypeTraits::equals(a - step*T(2.0), b)); - CORRADE_VERIFY(!TypeTraits::equalsZero(a - step*T(2.0) - b, magnitude)); + CORRADE_VERIFY(!TypeTraits::equals(a - step*T(2.0), a)); + CORRADE_VERIFY(!TypeTraits::equalsZero(a - step*T(2.0) - a, magnitude)); } }}}