llvm/libcxx
1
0
Fork 0
mirror of https://github.com/llvm-mirror/libcxx.git synced 2025-10-24 20:29:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

More constexpr algorithms from P0202. any_of/all_of/none_of.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@322492 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow
2018-01-15 17:20:36 +00:00
parent 8d0d82585a
commit de4b2869d7
4 changed files with 54 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/algorithm
View File

@@ -20,15 +20,15 @@ namespace std
{ {
template <class InputIterator, class Predicate> template <class InputIterator, class Predicate>
bool constexpr bool // constexpr in C++20
all_of(InputIterator first, InputIterator last, Predicate pred); all_of(InputIterator first, InputIterator last, Predicate pred);
template <class InputIterator, class Predicate> template <class InputIterator, class Predicate>
bool constexpr bool // constexpr in C++20
any_of(InputIterator first, InputIterator last, Predicate pred); any_of(InputIterator first, InputIterator last, Predicate pred);
template <class InputIterator, class Predicate> template <class InputIterator, class Predicate>
bool constexpr bool // constexpr in C++20
none_of(InputIterator first, InputIterator last, Predicate pred); none_of(InputIterator first, InputIterator last, Predicate pred);
template <class InputIterator, class Function> template <class InputIterator, class Function>
@@ -919,7 +919,7 @@ inline _LIBCPP_INLINE_VISIBILITY int __pop_count(unsigned long long __x) {
// all_of // all_of
template <class _InputIterator, class _Predicate> template <class _InputIterator, class _Predicate>
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
bool bool
all_of(_InputIterator __first, _InputIterator __last, _Predicate __pred) all_of(_InputIterator __first, _InputIterator __last, _Predicate __pred)
{ {
@@ -932,7 +932,7 @@ all_of(_InputIterator __first, _InputIterator __last, _Predicate __pred)
// any_of // any_of
template <class _InputIterator, class _Predicate> template <class _InputIterator, class _Predicate>
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
bool bool
any_of(_InputIterator __first, _InputIterator __last, _Predicate __pred) any_of(_InputIterator __first, _InputIterator __last, _Predicate __pred)
{ {
@@ -945,7 +945,7 @@ any_of(_InputIterator __first, _InputIterator __last, _Predicate __pred)
// none_of // none_of
template <class _InputIterator, class _Predicate> template <class _InputIterator, class _Predicate>
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
bool bool
none_of(_InputIterator __first, _InputIterator __last, _Predicate __pred) none_of(_InputIterator __first, _InputIterator __last, _Predicate __pred)
{ {

17
test/std/algorithms/alg.nonmodifying/alg.all_of/all_of.pass.cpp
View File

@@ -16,16 +16,27 @@
#include <algorithm> #include <algorithm>
#include <cassert> #include <cassert>
#include "test_macros.h"
#include "test_iterators.h" #include "test_iterators.h"
struct test1 struct test1
{ {
bool operator()(const int& i) const TEST_CONSTEXPR bool operator()(const int& i) const
{ {
return i % 2 == 0; return i % 2 == 0;
} }
}; };
#if TEST_STD_VER > 17
TEST_CONSTEXPR int test_constexpr() {
int ia[] = {2, 4, 6, 8};
int ib[] = {2, 4, 5, 8};
return std::all_of(std::begin(ia), std::end(ia), test1())
&& !std::all_of(std::begin(ib), std::end(ib), test1())
;
}
#endif
int main() int main()
{ {
{ {
@@ -44,4 +55,8 @@ int main()
assert(std::all_of(input_iterator<const int*>(ia), assert(std::all_of(input_iterator<const int*>(ia),
input_iterator<const int*>(ia), test1()) == true); input_iterator<const int*>(ia), test1()) == true);
} }
#if TEST_STD_VER > 17
static_assert(test_constexpr());
#endif
} }

17
test/std/algorithms/alg.nonmodifying/alg.any_of/any_of.pass.cpp
View File

@@ -16,16 +16,27 @@
#include <algorithm> #include <algorithm>
#include <cassert> #include <cassert>
#include "test_macros.h"
#include "test_iterators.h" #include "test_iterators.h"
struct test1 struct test1
{ {
bool operator()(const int& i) const TEST_CONSTEXPR bool operator()(const int& i) const
{ {
return i % 2 == 0; return i % 2 == 0;
} }
}; };
#if TEST_STD_VER > 17
TEST_CONSTEXPR int test_constexpr() {
int ia[] = {2, 4, 6, 8};
int ib[] = {1, 3, 5, 7};
return std::any_of(std::begin(ia), std::end(ia), test1())
&& !std::any_of(std::begin(ib), std::end(ib), test1())
;
}
#endif
int main() int main()
{ {
{ {
@@ -52,4 +63,8 @@ int main()
assert(std::any_of(input_iterator<const int*>(ia), assert(std::any_of(input_iterator<const int*>(ia),
input_iterator<const int*>(ia), test1()) == false); input_iterator<const int*>(ia), test1()) == false);
} }
#if TEST_STD_VER > 17
static_assert(test_constexpr());
#endif
} }

17
test/std/algorithms/alg.nonmodifying/alg.none_of/none_of.pass.cpp
View File

@@ -16,16 +16,27 @@
#include <algorithm> #include <algorithm>
#include <cassert> #include <cassert>
#include "test_macros.h"
#include "test_iterators.h" #include "test_iterators.h"
struct test1 struct test1
{ {
bool operator()(const int& i) const TEST_CONSTEXPR bool operator()(const int& i) const
{ {
return i % 2 == 0; return i % 2 == 0;
} }
}; };
#if TEST_STD_VER > 17
TEST_CONSTEXPR int test_constexpr() {
int ia[] = {1, 3, 6, 7};
int ib[] = {1, 3, 5, 7};
return !std::none_of(std::begin(ia), std::end(ia), test1())
&& std::none_of(std::begin(ib), std::end(ib), test1())
;
}
#endif
int main() int main()
{ {
{ {
@@ -52,4 +63,8 @@ int main()
assert(std::none_of(input_iterator<const int*>(ia), assert(std::none_of(input_iterator<const int*>(ia),
input_iterator<const int*>(ia), test1()) == true); input_iterator<const int*>(ia), test1()) == true);
} }
#if TEST_STD_VER > 17
static_assert(test_constexpr());
#endif
} }