Author: marshall
Date: Sun Jan 21 17:51:49 2018
New Revision: 323072
URL: http://llvm.org/viewvc/llvm-project?rev=323072&view=rev
Log:
Really comment out the constexpr tests.
Modified:
libcxx/trunk/test/std/algorithms/alg.sorting/alg.merge/merge.pass.cpp
libcxx/trunk/test/std/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp
Modified: libcxx/trunk/test/std/algorithms/alg.sorting/alg.merge/merge.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/algorithms/alg.sorting/alg.merge/merge.pass.cpp?rev=323072&r1=323071&r2=323072&view=diff
==============================================================================
--- libcxx/trunk/test/std/algorithms/alg.sorting/alg.merge/merge.pass.cpp
(original)
+++ libcxx/trunk/test/std/algorithms/alg.sorting/alg.merge/merge.pass.cpp Sun
Jan 21 17:51:49 2018
@@ -26,20 +26,20 @@
#include "test_iterators.h"
-#if TEST_STD_VER > 17
-TEST_CONSTEXPR bool test_constexpr() {
- int ia[] = {0, 1, 2, 3, 4};
- int ib[] = {2, 4, 6, 8};
- int ic[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
- const int expected[] = {0, 1, 2, 2, 3, 4, 4, 6, 8};
-
- auto it = std::merge(std::begin(ia), std::end(ia), std::begin(ib),
std::end(ib), std::begin(ic));
- return std::distance(std::begin(ic), it) == (std::size(ia) + std::size(ib))
- && *it == 0
- && std::equal(std::begin(ic), it, std::begin(expected),
std::end(expected))
- ;
- }
-#endif
+// #if TEST_STD_VER > 17
+// TEST_CONSTEXPR bool test_constexpr() {
+// int ia[] = {0, 1, 2, 3, 4};
+// int ib[] = {2, 4, 6, 8};
+// int ic[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+// const int expected[] = {0, 1, 2, 2, 3, 4, 4, 6, 8};
+//
+// auto it = std::merge(std::begin(ia), std::end(ia), std::begin(ib),
std::end(ib), std::begin(ic));
+// return std::distance(std::begin(ic), it) == (std::size(ia) +
std::size(ib))
+// && *it == 0
+// && std::equal(std::begin(ic), it, std::begin(expected),
std::end(expected))
+// ;
+// }
+// #endif
std::mt19937 randomness;
Modified:
libcxx/trunk/test/std/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp?rev=323072&r1=323071&r2=323072&view=diff
==============================================================================
--- libcxx/trunk/test/std/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp
(original)
+++ libcxx/trunk/test/std/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp
Sun Jan 21 17:51:49 2018
@@ -29,22 +29,22 @@
#include "test_iterators.h"
#include "counting_predicates.hpp"
-#if TEST_STD_VER > 17
-TEST_CONSTEXPR bool test_constexpr() {
- int ia[] = {0, 1, 2, 3, 4};
- int ib[] = {2, 4, 6, 8};
- int ic[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
- const int expected[] = {0, 1, 2, 2, 3, 4, 4, 6, 8};
-
- auto it = std::merge(std::begin(ia), std::end(ia),
- std::begin(ib), std::end(ib),
- std::begin(ic), [](int a, int b) {return a == b; });
- return std::distance(std::begin(ic), it) == (std::size(ia) + std::size(ib))
- && *it == 0
- && std::equal(std::begin(ic), it, std::begin(expected),
std::end(expected))
- ;
- }
-#endif
+// #if TEST_STD_VER > 17
+// TEST_CONSTEXPR bool test_constexpr() {
+// int ia[] = {0, 1, 2, 3, 4};
+// int ib[] = {2, 4, 6, 8};
+// int ic[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+// const int expected[] = {0, 1, 2, 2, 3, 4, 4, 6, 8};
+//
+// auto it = std::merge(std::begin(ia), std::end(ia),
+// std::begin(ib), std::end(ib),
+// std::begin(ic), [](int a, int b) {return a == b;
});
+// return std::distance(std::begin(ic), it) == (std::size(ia) +
std::size(ib))
+// && *it == 0
+// && std::equal(std::begin(ic), it, std::begin(expected),
std::end(expected))
+// ;
+// }
+// #endif
std::mt19937 randomness;
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
