From 60b56b09990fbf96b8edf897debc67fde8c111df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 16 Oct 2016 00:42:28 +0200 Subject: [PATCH] Math: no need for that GCC type deduction workaround anymore. --- src/Magnum/Math/Test/TypeTraitsTest.cpp | 89 ++++++++++++------------- 1 file changed, 44 insertions(+), 45 deletions(-) diff --git a/src/Magnum/Math/Test/TypeTraitsTest.cpp b/src/Magnum/Math/Test/TypeTraitsTest.cpp index fd34cfa06..68e8a7c33 100644 --- a/src/Magnum/Math/Test/TypeTraitsTest.cpp +++ b/src/Magnum/Math/Test/TypeTraitsTest.cpp @@ -94,51 +94,50 @@ struct { } TypeTraitsTest::TypeTraitsTest() { - addTests({ - &TypeTraitsTest::name, - - &TypeTraitsTest::equalsIntegral, - &TypeTraitsTest::equalsIntegral, - &TypeTraitsTest::equalsIntegral, - &TypeTraitsTest::equalsIntegral, - &TypeTraitsTest::equalsIntegral, - &TypeTraitsTest::equalsIntegral, - #ifndef CORRADE_TARGET_EMSCRIPTEN - &TypeTraitsTest::equalsIntegral, - &TypeTraitsTest::equalsIntegral, - #endif - - &TypeTraitsTest::equalsFloatingPoint0, - &TypeTraitsTest::equalsFloatingPoint0, - #ifndef CORRADE_TARGET_EMSCRIPTEN - &TypeTraitsTest::equalsFloatingPoint0, - #endif - &TypeTraitsTest::equalsFloatingPoint1, - &TypeTraitsTest::equalsFloatingPoint1, - #ifndef CORRADE_TARGET_EMSCRIPTEN - &TypeTraitsTest::equalsFloatingPoint1, - #endif - &TypeTraitsTest::equalsFloatingPointLarge, - &TypeTraitsTest::equalsFloatingPointLarge, - #ifndef CORRADE_TARGET_EMSCRIPTEN - &TypeTraitsTest::equalsFloatingPointLarge, - #endif - &TypeTraitsTest::equalsFloatingPointInfinity, - &TypeTraitsTest::equalsFloatingPointInfinity, - &TypeTraitsTest::equalsFloatingPointNaN, - &TypeTraitsTest::equalsFloatingPointNaN, - - &TypeTraitsTest::equalsZeroIntegral, - &TypeTraitsTest::equalsZeroIntegral, - &TypeTraitsTest::equalsZeroIntegral, - &TypeTraitsTest::equalsZeroIntegral, - &TypeTraitsTest::equalsZeroIntegral, - &TypeTraitsTest::equalsZeroIntegral, - #ifndef CORRADE_TARGET_EMSCRIPTEN - &TypeTraitsTest::equalsZeroIntegral, - &TypeTraitsTest::equalsZeroIntegral, - #endif - }); + addTests({&TypeTraitsTest::name, + + &TypeTraitsTest::equalsIntegral, + &TypeTraitsTest::equalsIntegral, + &TypeTraitsTest::equalsIntegral, + &TypeTraitsTest::equalsIntegral, + &TypeTraitsTest::equalsIntegral, + &TypeTraitsTest::equalsIntegral, + #ifndef CORRADE_TARGET_EMSCRIPTEN + &TypeTraitsTest::equalsIntegral, + &TypeTraitsTest::equalsIntegral, + #endif + + &TypeTraitsTest::equalsFloatingPoint0, + &TypeTraitsTest::equalsFloatingPoint0, + #ifndef CORRADE_TARGET_EMSCRIPTEN + &TypeTraitsTest::equalsFloatingPoint0, + #endif + &TypeTraitsTest::equalsFloatingPoint1, + &TypeTraitsTest::equalsFloatingPoint1, + #ifndef CORRADE_TARGET_EMSCRIPTEN + &TypeTraitsTest::equalsFloatingPoint1, + #endif + &TypeTraitsTest::equalsFloatingPointLarge, + &TypeTraitsTest::equalsFloatingPointLarge, + #ifndef CORRADE_TARGET_EMSCRIPTEN + &TypeTraitsTest::equalsFloatingPointLarge, + #endif + &TypeTraitsTest::equalsFloatingPointInfinity, + &TypeTraitsTest::equalsFloatingPointInfinity, + &TypeTraitsTest::equalsFloatingPointNaN, + &TypeTraitsTest::equalsFloatingPointNaN, + + &TypeTraitsTest::equalsZeroIntegral, + &TypeTraitsTest::equalsZeroIntegral, + &TypeTraitsTest::equalsZeroIntegral, + &TypeTraitsTest::equalsZeroIntegral, + &TypeTraitsTest::equalsZeroIntegral, + &TypeTraitsTest::equalsZeroIntegral, + #ifndef CORRADE_TARGET_EMSCRIPTEN + &TypeTraitsTest::equalsZeroIntegral, + &TypeTraitsTest::equalsZeroIntegral, + #endif + }); addInstancedTests({ &TypeTraitsTest::equalsZeroFloatingPoint,