diff options
author | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-03-11 11:53:38 -0800 |
---|---|---|
committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-03-11 11:53:38 -0800 |
commit | c5b98a58b8ea018be71cdc03f7060d2b96184a84 (patch) | |
tree | 348549aa3cffd3a3ea81bbb050556f90bdf48728 /unsupported/test/cxx11_meta.cpp | |
parent | 456e038a4e50c9297489f51de42b8ba126a77709 (diff) |
Updated the cxx11_meta test to work on the Eigen::array class when std::array isn't available.
Diffstat (limited to 'unsupported/test/cxx11_meta.cpp')
-rw-r--r-- | unsupported/test/cxx11_meta.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
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<int, 6> a{{4, 8, 15, 16, 23, 42}}; - std::array<int, 6> b{{42, 23, 16, 15, 8, 4}}; + array<int, 6> a{{4, 8, 15, 16, 23, 42}}; + array<int, 6> 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<int, 6> a{{4, 8, 15, 16, 23, 42}}; - std::array<int, 6> b{{0, 1, 2, 3, 4, 5}}; - std::array<int, 6> c{{4, 9, 17, 19, 27, 47}}; - std::array<int, 6> d{{0, 8, 30, 48, 92, 210}}; - std::array<int, 6> e{{0, 2, 4, 6, 8, 10}}; + array<int, 6> a{{4, 8, 15, 16, 23, 42}}; + array<int, 6> b{{0, 1, 2, 3, 4, 5}}; + array<int, 6> c{{4, 9, 17, 19, 27, 47}}; + array<int, 6> d{{0, 8, 30, 48, 92, 210}}; + array<int, 6> e{{0, 2, 4, 6, 8, 10}}; VERIFY((array_zip<sum_op>(a, b) == c)); VERIFY((array_zip<product_op>(a, b) == d)); @@ -326,8 +326,8 @@ static void test_array_zip_and_apply() static void test_array_misc() { - std::array<int, 3> a3{{1, 1, 1}}; - std::array<int, 6> a6{{2, 2, 2, 2, 2, 2}}; + array<int, 3> a3{{1, 1, 1}}; + array<int, 6> a6{{2, 2, 2, 2, 2, 2}}; VERIFY((repeat<3, int>(1) == a3)); VERIFY((repeat<6, int>(2) == a6)); |