From c5b98a58b8ea018be71cdc03f7060d2b96184a84 Mon Sep 17 00:00:00 2001 From: Benoit Steiner Date: Fri, 11 Mar 2016 11:53:38 -0800 Subject: Updated the cxx11_meta test to work on the Eigen::array class when std::array isn't available. --- unsupported/test/cxx11_meta.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'unsupported/test/cxx11_meta.cpp') diff --git a/unsupported/test/cxx11_meta.cpp b/unsupported/test/cxx11_meta.cpp index f9179bbe6..62db0e71e 100644 --- a/unsupported/test/cxx11_meta.cpp +++ b/unsupported/test/cxx11_meta.cpp @@ -294,8 +294,8 @@ static void test_arg_reductions() static void test_array_reverse_and_reduce() { - std::array a{{4, 8, 15, 16, 23, 42}}; - std::array b{{42, 23, 16, 15, 8, 4}}; + array a{{4, 8, 15, 16, 23, 42}}; + array b{{42, 23, 16, 15, 8, 4}}; // there is no operator<< for std::array, so VERIFY_IS_EQUAL will // not compile @@ -309,11 +309,11 @@ static void test_array_reverse_and_reduce() static void test_array_zip_and_apply() { - std::array a{{4, 8, 15, 16, 23, 42}}; - std::array b{{0, 1, 2, 3, 4, 5}}; - std::array c{{4, 9, 17, 19, 27, 47}}; - std::array d{{0, 8, 30, 48, 92, 210}}; - std::array e{{0, 2, 4, 6, 8, 10}}; + array a{{4, 8, 15, 16, 23, 42}}; + array b{{0, 1, 2, 3, 4, 5}}; + array c{{4, 9, 17, 19, 27, 47}}; + array d{{0, 8, 30, 48, 92, 210}}; + array e{{0, 2, 4, 6, 8, 10}}; VERIFY((array_zip(a, b) == c)); VERIFY((array_zip(a, b) == d)); @@ -326,8 +326,8 @@ static void test_array_zip_and_apply() static void test_array_misc() { - std::array a3{{1, 1, 1}}; - std::array a6{{2, 2, 2, 2, 2, 2}}; + array a3{{1, 1, 1}}; + array a6{{2, 2, 2, 2, 2, 2}}; VERIFY((repeat<3, int>(1) == a3)); VERIFY((repeat<6, int>(2) == a6)); -- cgit v1.2.3