More P0202 constexpr-ifying. All the find_XXX algorithms in this commit.

llvm-svn: 322504

3 files changed, 53 insertions, 7 deletions

diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find.pass.cpp
index 09f0f41215c..faff926d3d6 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find.pass.cpp
@@ -11,14 +11,25 @@
 
 // template<InputIterator Iter, class T>
 //   requires HasEqualTo<Iter::value_type, T>
-//   Iter
+//   constexpr Iter   // constexpr after C++17
 //   find(Iter first, Iter last, const T& value);
 
 #include <algorithm>
 #include <cassert>
 
+#include "test_macros.h"
 #include "test_iterators.h"
 
+#if TEST_STD_VER > 17
+TEST_CONSTEXPR bool test_constexpr() {
+    int ia[] = {1, 3, 5, 2, 4, 6};
+    int ib[] = {1, 2, 3, 4, 5, 6};
+    return    (std::find(std::begin(ia), std::end(ia), 5) == ia+2)
+           && (std::find(std::begin(ib), std::end(ib), 9) == ib+6)
+           ;
+    }
+#endif
+
 int main()
 {
     int ia[] = {0, 1, 2, 3, 4, 5};
@@ -28,4 +39,8 @@ int main()
     assert(*r == 3);
     r = std::find(input_iterator<const int*>(ia), input_iterator<const int*>(ia+s), 10);
     assert(r == input_iterator<const int*>(ia+s));
+
+#if TEST_STD_VER > 17
+    static_assert(test_constexpr());
+#endif
 }
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find_if.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find_if.pass.cpp
index fa1faf17e0f..0fe084c01b5 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find_if.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find_if.pass.cpp
@@ -11,21 +11,33 @@
 
 // template<InputIterator Iter, Predicate<auto, Iter::value_type> Pred>
 //   requires CopyConstructible<Pred>
-//   Iter
+//   constexpr Iter   // constexpr after C++17
 //   find_if(Iter first, Iter last, Pred pred);
 
 #include <algorithm>
 #include <functional>
 #include <cassert>
 
+#include "test_macros.h"
 #include "test_iterators.h"
 
 struct eq {
-    eq (int val) : v(val) {}
-    bool operator () (int v2) const { return v == v2; }
+    TEST_CONSTEXPR eq (int val) : v(val) {}
+    TEST_CONSTEXPR bool operator () (int v2) const { return v == v2; }
     int v;
     };
 
+#if TEST_STD_VER > 17
+TEST_CONSTEXPR bool test_constexpr() {
+    int ia[] = {1, 3, 5, 2, 4, 6};
+    int ib[] = {1, 2, 3, 7, 5, 6};
+    eq c(4);
+    return    (std::find_if(std::begin(ia), std::end(ia), c) == ia+4)
+           && (std::find_if(std::begin(ib), std::end(ib), c) == ib+6)
+           ;
+    }
+#endif
+
 int main()
 {
     int ia[] = {0, 1, 2, 3, 4, 5};
@@ -38,4 +50,8 @@ int main()
                      input_iterator<const int*>(ia+s),
                      eq(10));
     assert(r == input_iterator<const int*>(ia+s));
+
+#if TEST_STD_VER > 17
+    static_assert(test_constexpr());
+#endif
 }
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find_if_not.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find_if_not.pass.cpp
index 1f3c34b2144..971a94dce2e 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find_if_not.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find_if_not.pass.cpp
@@ -11,21 +11,32 @@
 
 // template<InputIterator Iter, Predicate<auto, Iter::value_type> Pred>
 //   requires CopyConstructible<Pred>
-//   Iter
+//   constexpr Iter   // constexpr after C++17
 //   find_if_not(Iter first, Iter last, Pred pred);
 
 #include <algorithm>
 #include <functional>
 #include <cassert>
 
+#include "test_macros.h"
 #include "test_iterators.h"
 
 struct ne {
-    ne (int val) : v(val) {}
-    bool operator () (int v2) const { return v != v2; }
+    TEST_CONSTEXPR ne (int val) : v(val) {}
+    TEST_CONSTEXPR bool operator () (int v2) const { return v != v2; }
     int v;
     };
 
+#if TEST_STD_VER > 17
+TEST_CONSTEXPR bool test_constexpr() {
+    int ia[] = {1, 3, 5, 2, 4, 6};
+    int ib[] = {1, 2, 3, 7, 5, 6};
+    ne c(4);
+    return    (std::find_if_not(std::begin(ia), std::end(ia), c) == ia+4)
+           && (std::find_if_not(std::begin(ib), std::end(ib), c) == ib+6)
+           ;
+    }
+#endif
 
 int main()
 {
@@ -39,4 +50,8 @@ int main()
                          input_iterator<const int*>(ia+s),
                          ne(10));
     assert(r == input_iterator<const int*>(ia+s));
+
+#if TEST_STD_VER > 17
+    static_assert(test_constexpr());
+#endif
 }