From ba0f56fa519acce3fef5dca0eb5393f4c9dc3608 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 18 Mar 2013 19:35:20 +0100 Subject: [PATCH] No need to use Double type in tests so extensively. Makes porting to OpenGL ES easier. --- src/Math/Test/UnitTest.cpp | 4 ++-- src/Test/SwizzleTest.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Math/Test/UnitTest.cpp b/src/Math/Test/UnitTest.cpp index d1d687a9a..1951fd127 100644 --- a/src/Math/Test/UnitTest.cpp +++ b/src/Math/Test/UnitTest.cpp @@ -55,7 +55,7 @@ UnitTest::UnitTest() { template struct Sec_; typedef Unit Sec; -typedef Unit Secd; +typedef Unit Seci; inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, Sec value) { return debug << Float(value); @@ -72,7 +72,7 @@ void UnitTest::constructDefault() { } void UnitTest::constructConversion() { - constexpr Secd a(25.0); + constexpr Seci a(25.0); constexpr Sec b(a); CORRADE_COMPARE(b, Sec(25.0f)); } diff --git a/src/Test/SwizzleTest.cpp b/src/Test/SwizzleTest.cpp index e340c3fa8..a7c18d453 100644 --- a/src/Test/SwizzleTest.cpp +++ b/src/Test/SwizzleTest.cpp @@ -51,7 +51,7 @@ void SwizzleTest::rgba() { void SwizzleTest::type() { constexpr Vector4i orig; constexpr Color3 origColor3; - constexpr Color4 origColor4; + constexpr Color4 origColor4; constexpr auto a = swizzle<'y', 'a'>(orig); CORRADE_VERIFY((std::is_same::value)); @@ -66,13 +66,13 @@ void SwizzleTest::type() { CORRADE_VERIFY((std::is_same>::value)); constexpr auto e = swizzle<'y', 'z', 'a'>(origColor4); - CORRADE_VERIFY((std::is_same>::value)); + CORRADE_VERIFY((std::is_same>::value)); constexpr auto f = swizzle<'y', 'z', 'y', 'x'>(origColor3); CORRADE_VERIFY((std::is_same>::value)); constexpr auto g = swizzle<'y', 'a', 'y', 'x'>(origColor4); - CORRADE_VERIFY((std::is_same>::value)); + CORRADE_VERIFY((std::is_same>::value)); } void SwizzleTest::defaultType() {