From fa774370aa50cd9ea8e376c83fab0be03af3021b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 15 Sep 2012 00:04:32 +0200 Subject: [PATCH] GCC 4.6 doesn't support template aliases. --- src/Test/SwizzleTest.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Test/SwizzleTest.cpp b/src/Test/SwizzleTest.cpp index 299603280..00be3d7ea 100644 --- a/src/Test/SwizzleTest.cpp +++ b/src/Test/SwizzleTest.cpp @@ -27,8 +27,6 @@ typedef Math::Vector2 Vector2; typedef Math::Vector3 Vector3; typedef Math::Vector4 Vector4; -template using Vector = Math::Vector; - SwizzleTest::SwizzleTest() { addTests(&SwizzleTest::xyzw, &SwizzleTest::rgba, @@ -81,10 +79,10 @@ void SwizzleTest::type() { void SwizzleTest::defaultType() { Vector4 orig(1, 2, 3, 4); - CORRADE_COMPARE(swizzle<'b'>(orig), Vector<1>(3)); - CORRADE_COMPARE(swizzle(orig, "b"), Vector<1>(3)); - CORRADE_COMPARE((swizzle<'b', 'r', 'a', 'g', 'z', 'y', 'x'>(orig)), Vector<7>(3, 1, 4, 2, 3, 2, 1)); - CORRADE_COMPARE(swizzle(orig, "bragzyx"), Vector<7>(3, 1, 4, 2, 3, 2, 1)); + CORRADE_COMPARE(swizzle<'b'>(orig), (Math::Vector<1, int>(3))); + CORRADE_COMPARE(swizzle(orig, "b"), (Math::Vector<1, int>(3))); + CORRADE_COMPARE((swizzle<'b', 'r', 'a', 'g', 'z', 'y', 'x'>(orig)), (Math::Vector<7, int>(3, 1, 4, 2, 3, 2, 1))); + CORRADE_COMPARE(swizzle(orig, "bragzyx"), (Math::Vector<7, int>(3, 1, 4, 2, 3, 2, 1))); } }}