maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

More constexpr from P0202. count and count_if. Also fix a comment that Morwenn noted. 

llvm-svn: 322506
This commit is contained in:
Marshall Clow 2018-01-15 19:40:34 +00:00
parent 404ee020f0
commit 056f15e3c5
3 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libcxx/include/algorithm
View File

@ -79,11 +79,11 @@ template <class ForwardIterator, class BinaryPredicate>
adjacent_find(ForwardIterator first, ForwardIterator last, BinaryPredicate pred); adjacent_find(ForwardIterator first, ForwardIterator last, BinaryPredicate pred);
template <class InputIterator, class T> template <class InputIterator, class T>
typename iterator_traits<InputIterator>::difference_type constexpr typename iterator_traits<InputIterator>::difference_type // constexpr in C++20
count(InputIterator first, InputIterator last, const T& value); count(InputIterator first, InputIterator last, const T& value);
template <class InputIterator, class Predicate> template <class InputIterator, class Predicate>
typename iterator_traits<InputIterator>::difference_type constexpr typename iterator_traits<InputIterator>::difference_type // constexpr in C++20
count_if(InputIterator first, InputIterator last, Predicate pred); count_if(InputIterator first, InputIterator last, Predicate pred);
template <class InputIterator1, class InputIterator2> template <class InputIterator1, class InputIterator2>
@ -333,11 +333,11 @@ template <class ForwardIterator, class Compare>
is_sorted(ForwardIterator first, ForwardIterator last, Compare comp); is_sorted(ForwardIterator first, ForwardIterator last, Compare comp);
template<class ForwardIterator> template<class ForwardIterator>
ForwardIterator constexpr ForwardIterator // constexpr in C++20
is_sorted_until(ForwardIterator first, ForwardIterator last); is_sorted_until(ForwardIterator first, ForwardIterator last);
template <class ForwardIterator, class Compare> template <class ForwardIterator, class Compare>
ForwardIterator constexpr ForwardIterator // constexpr in C++20
is_sorted_until(ForwardIterator first, ForwardIterator last, Compare comp); is_sorted_until(ForwardIterator first, ForwardIterator last, Compare comp);
template <class RandomAccessIterator> template <class RandomAccessIterator>
@ -1240,7 +1240,7 @@ adjacent_find(_ForwardIterator __first, _ForwardIterator __last)
// count // count
template <class _InputIterator, class _Tp> template <class _InputIterator, class _Tp>
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
typename iterator_traits<_InputIterator>::difference_type typename iterator_traits<_InputIterator>::difference_type
count(_InputIterator __first, _InputIterator __last, const _Tp& __value_) count(_InputIterator __first, _InputIterator __last, const _Tp& __value_)
{ {
@ -1254,7 +1254,7 @@ count(_InputIterator __first, _InputIterator __last, const _Tp& __value_)
// count_if // count_if
template <class _InputIterator, class _Predicate> template <class _InputIterator, class _Predicate>
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
typename iterator_traits<_InputIterator>::difference_type typename iterator_traits<_InputIterator>::difference_type
count_if(_InputIterator __first, _InputIterator __last, _Predicate __pred) count_if(_InputIterator __first, _InputIterator __last, _Predicate __pred)
{ {

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

@ -11,14 +11,25 @@
// template<InputIterator Iter, class T> // template<InputIterator Iter, class T>
// requires HasEqualTo<Iter::value_type, T> // requires HasEqualTo<Iter::value_type, T>
// Iter::difference_type // constexpr Iter::difference_type // constexpr after C++17
// count(Iter first, Iter last, const T& value); // count(Iter first, Iter last, const T& value);
#include <algorithm> #include <algorithm>
#include <cassert> #include <cassert>
#include "test_macros.h"
#include "test_iterators.h" #include "test_iterators.h"
#if TEST_STD_VER > 17
TEST_CONSTEXPR bool test_constexpr() {
int ia[] = {0, 1, 2, 2, 0, 1, 2, 3};
int ib[] = {1, 2, 3, 4, 5, 6};
return (std::count(std::begin(ia), std::end(ia), 2) == 3)
&& (std::count(std::begin(ib), std::end(ib), 9) == 0)
;
}
#endif
int main() int main()
{ {
int ia[] = {0, 1, 2, 2, 0, 1, 2, 3}; int ia[] = {0, 1, 2, 2, 0, 1, 2, 3};
@ -29,4 +40,8 @@ int main()
input_iterator<const int*>(ia + sa), 7) == 0); input_iterator<const int*>(ia + sa), 7) == 0);
assert(std::count(input_iterator<const int*>(ia), assert(std::count(input_iterator<const int*>(ia),
input_iterator<const int*>(ia), 2) == 0); input_iterator<const int*>(ia), 2) == 0);
#if TEST_STD_VER > 17
static_assert(test_constexpr());
#endif
} }

20
libcxx/test/std/algorithms/alg.nonmodifying/alg.count/count_if.pass.cpp
View File

@ -11,21 +11,31 @@
// template<InputIterator Iter, Predicate<auto, Iter::value_type> Pred> // template<InputIterator Iter, Predicate<auto, Iter::value_type> Pred>
// requires CopyConstructible<Pred> // requires CopyConstructible<Pred>
// Iter::difference_type // constexpr Iter::difference_type // constexpr after C++17
// count_if(Iter first, Iter last, Pred pred); // count_if(Iter first, Iter last, Pred pred);
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <cassert> #include <cassert>
#include "test_macros.h"
#include "test_iterators.h" #include "test_iterators.h"
struct eq { struct eq {
eq (int val) : v(val) {} TEST_CONSTEXPR eq (int val) : v(val) {}
bool operator () (int v2) const { return v == v2; } TEST_CONSTEXPR bool operator () (int v2) const { return v == v2; }
int v; int v;
}; };
#if TEST_STD_VER > 17
TEST_CONSTEXPR bool test_constexpr() {
int ia[] = {0, 1, 2, 2, 0, 1, 2, 3};
int ib[] = {1, 2, 3, 4, 5, 6};
return (std::count_if(std::begin(ia), std::end(ia), eq(2)) == 3)
&& (std::count_if(std::begin(ib), std::end(ib), eq(9)) == 0)
;
}
#endif
int main() int main()
{ {
@ -40,4 +50,8 @@ int main()
assert(std::count_if(input_iterator<const int*>(ia), assert(std::count_if(input_iterator<const int*>(ia),
input_iterator<const int*>(ia), input_iterator<const int*>(ia),
eq(2)) == 0); eq(2)) == 0);
#if TEST_STD_VER > 17
static_assert(test_constexpr());
#endif
} }