Author: marshall
Date: Mon Jan 15 08:16:32 2018
New Revision: 322489
URL: http://llvm.org/viewvc/llvm-project?rev=322489&view=rev
Log:
First part of P0202: Adding constexpr modifiers to functions in <algorithm> and
<utility>. This commit is all the is_XXX algorithms.
Modified:
libcxx/trunk/include/algorithm
libcxx/trunk/test/std/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp
libcxx/trunk/test/std/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation.pass.cpp
libcxx/trunk/test/std/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation_pred.pass.cpp
libcxx/trunk/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap.pass.cpp
libcxx/trunk/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_comp.pass.cpp
libcxx/trunk/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until.pass.cpp
libcxx/trunk/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until_comp.pass.cpp
libcxx/trunk/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp
libcxx/trunk/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp
libcxx/trunk/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp
libcxx/trunk/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp
libcxx/trunk/www/cxx2a_status.html
Modified: libcxx/trunk/include/algorithm
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/algorithm?rev=322489&r1=322488&r2=322489&view=diff
==============================================================================
--- libcxx/trunk/include/algorithm (original)
+++ libcxx/trunk/include/algorithm Mon Jan 15 08:16:32 2018
@@ -39,11 +39,11 @@ template<class InputIterator, class Size
InputIterator for_each_n(InputIterator first, Size n, Function f); // C++17
template <class InputIterator, class T>
- InputIterator
+ constexpr InputIterator // constexpr in C++20
find(InputIterator first, InputIterator last, const T& value);
template <class InputIterator, class Predicate>
- InputIterator
+ constexpr InputIterator // constexpr in C++20
find_if(InputIterator first, InputIterator last, Predicate pred);
template<class InputIterator, class Predicate>
@@ -127,22 +127,22 @@ template <class InputIterator1, class In
BinaryPredicate pred); // **C++14**
template<class ForwardIterator1, class ForwardIterator2>
- bool
+ constexpr bool // constexpr in C++20
is_permutation(ForwardIterator1 first1, ForwardIterator1 last1,
ForwardIterator2 first2);
template<class ForwardIterator1, class ForwardIterator2>
- bool
+ constexpr bool // constexpr in C++20
is_permutation(ForwardIterator1 first1, ForwardIterator1 last1,
ForwardIterator2 first2, ForwardIterator2 last2); //
**C++14**
template<class ForwardIterator1, class ForwardIterator2, class BinaryPredicate>
- bool
+ constexpr bool // constexpr in C++20
is_permutation(ForwardIterator1 first1, ForwardIterator1 last1,
ForwardIterator2 first2, BinaryPredicate pred);
template<class ForwardIterator1, class ForwardIterator2, class BinaryPredicate>
- bool
+ constexpr bool // constexpr in C++20
is_permutation(ForwardIterator1 first1, ForwardIterator1 last1,
ForwardIterator2 first2, ForwardIterator2 last2,
BinaryPredicate pred); // **C++14**
@@ -302,7 +302,7 @@ template<class RandomAccessIterator, cla
UniformRandomNumberGenerator&& g);
template <class InputIterator, class Predicate>
- bool
+ constexpr bool // constexpr in C++20
is_partitioned(InputIterator first, InputIterator last, Predicate pred);
template <class ForwardIterator, class Predicate>
@@ -325,7 +325,7 @@ template<class ForwardIterator, class Pr
partition_point(ForwardIterator first, ForwardIterator last, Predicate
pred);
template <class ForwardIterator>
- bool
+ constexpr bool // constexpr in C++20
is_sorted(ForwardIterator first, ForwardIterator last);
template <class ForwardIterator, class Compare>
@@ -513,19 +513,19 @@ template <class RandomAccessIterator, cl
sort_heap(RandomAccessIterator first, RandomAccessIterator last, Compare
comp);
template <class RandomAccessIterator>
- bool
+ constexpr bool // constexpr in C++20
is_heap(RandomAccessIterator first, RandomAccessiterator last);
template <class RandomAccessIterator, class Compare>
- bool
+ constexpr bool // constexpr in C++20
is_heap(RandomAccessIterator first, RandomAccessiterator last, Compare
comp);
template <class RandomAccessIterator>
- RandomAccessIterator
+ constexpr RandomAccessIterator // constexpr in C++20
is_heap_until(RandomAccessIterator first, RandomAccessiterator last);
template <class RandomAccessIterator, class Compare>
- RandomAccessIterator
+ constexpr RandomAccessIterator // constexpr in C++20
is_heap_until(RandomAccessIterator first, RandomAccessiterator last,
Compare comp);
template <class ForwardIterator>
@@ -990,7 +990,7 @@ for_each_n(_InputIterator __first, _Size
// find
template <class _InputIterator, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
_InputIterator
find(_InputIterator __first, _InputIterator __last, const _Tp& __value_)
{
@@ -1003,7 +1003,7 @@ find(_InputIterator __first, _InputItera
// find_if
template <class _InputIterator, class _Predicate>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
_InputIterator
find_if(_InputIterator __first, _InputIterator __last, _Predicate __pred)
{
@@ -1395,17 +1395,18 @@ equal(_InputIterator1 __first1, _InputIt
// is_permutation
template<class _ForwardIterator1, class _ForwardIterator2, class
_BinaryPredicate>
-bool
+_LIBCPP_CONSTEXPR_AFTER_CXX17 bool
is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
_ForwardIterator2 __first2, _BinaryPredicate __pred)
{
- // shorten sequences as much as possible by lopping of any equal parts
+// shorten sequences as much as possible by lopping of any equal prefix
for (; __first1 != __last1; ++__first1, (void) ++__first2)
if (!__pred(*__first1, *__first2))
- goto __not_done;
- return true;
-__not_done:
- // __first1 != __last1 && *__first1 != *__first2
+ break;
+ if (__first1 == __last1)
+ return true;
+
+// __first1 != __last1 && *__first1 != *__first2
typedef typename iterator_traits<_ForwardIterator1>::difference_type _D1;
_D1 __l1 = _VSTD::distance(__first1, __last1);
if (__l1 == _D1(1))
@@ -1415,11 +1416,8 @@ __not_done:
// equal elements in [f2, l2)
for (_ForwardIterator1 __i = __first1; __i != __last1; ++__i)
{
- // Have we already counted the number of *__i in [f1, l1)?
- for (_ForwardIterator1 __j = __first1; __j != __i; ++__j)
- if (__pred(*__j, *__i))
- goto __next_iter;
- {
+ // Have we already counted the number of *__i in [f1, l1)?
+ if (find(__first1, __i, *__i) == __i) {
// Count number of *__i in [f2, l2)
_D1 __c2 = 0;
for (_ForwardIterator2 __j = __first2; __j != __last2; ++__j)
@@ -1435,13 +1433,12 @@ __not_done:
if (__c1 != __c2)
return false;
}
-__next_iter:;
}
return true;
}
template<class _ForwardIterator1, class _ForwardIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
bool
is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
_ForwardIterator2 __first2)
@@ -1453,19 +1450,21 @@ is_permutation(_ForwardIterator1 __first
#if _LIBCPP_STD_VER > 11
template<class _BinaryPredicate, class _ForwardIterator1, class
_ForwardIterator2>
-bool
+_LIBCPP_CONSTEXPR_AFTER_CXX17 bool
__is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
_ForwardIterator2 __first2, _ForwardIterator2 __last2,
_BinaryPredicate __pred,
forward_iterator_tag, forward_iterator_tag )
{
- // shorten sequences as much as possible by lopping of any equal parts
+// shorten sequences as much as possible by lopping of any equal prefix
for (; __first1 != __last1 && __first2 != __last2; ++__first1, (void)
++__first2)
if (!__pred(*__first1, *__first2))
- goto __not_done;
- return __first1 == __last1 && __first2 == __last2;
-__not_done:
- // __first1 != __last1 && __first2 != __last2 && *__first1 != *__first2
+ break;
+ if (__first1 == __last1)
+ return __first2 == __last2;
+ else if (__first2 == __last2)
+ return false;
+
typedef typename iterator_traits<_ForwardIterator1>::difference_type _D1;
_D1 __l1 = _VSTD::distance(__first1, __last1);
@@ -1478,11 +1477,8 @@ __not_done:
// equal elements in [f2, l2)
for (_ForwardIterator1 __i = __first1; __i != __last1; ++__i)
{
- // Have we already counted the number of *__i in [f1, l1)?
- for (_ForwardIterator1 __j = __first1; __j != __i; ++__j)
- if (__pred(*__j, *__i))
- goto __next_iter;
- {
+ // Have we already counted the number of *__i in [f1, l1)?
+ if (find(__first1, __i, *__i) == __i) {
// Count number of *__i in [f2, l2)
_D1 __c2 = 0;
for (_ForwardIterator2 __j = __first2; __j != __last2; ++__j)
@@ -1498,13 +1494,12 @@ __not_done:
if (__c1 != __c2)
return false;
}
-__next_iter:;
}
return true;
}
template<class _BinaryPredicate, class _RandomAccessIterator1, class
_RandomAccessIterator2>
-bool
+_LIBCPP_CONSTEXPR_AFTER_CXX17 bool
__is_permutation(_RandomAccessIterator1 __first1, _RandomAccessIterator2
__last1,
_RandomAccessIterator1 __first2, _RandomAccessIterator2 __last2,
_BinaryPredicate __pred,
@@ -1518,7 +1513,7 @@ __is_permutation(_RandomAccessIterator1
}
template<class _ForwardIterator1, class _ForwardIterator2, class
_BinaryPredicate>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
bool
is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
_ForwardIterator2 __first2, _ForwardIterator2 __last2,
@@ -1531,7 +1526,7 @@ is_permutation(_ForwardIterator1 __first
}
template<class _ForwardIterator1, class _ForwardIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
bool
is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
_ForwardIterator2 __first2, _ForwardIterator2 __last2)
@@ -3231,7 +3226,7 @@ template<class _RandomAccessIterator, cl
}
template <class _InputIterator, class _Predicate>
-bool
+_LIBCPP_CONSTEXPR_AFTER_CXX17 bool
is_partitioned(_InputIterator __first, _InputIterator __last, _Predicate
__pred)
{
for (; __first != __last; ++__first)
@@ -3639,7 +3634,7 @@ stable_partition(_ForwardIterator __firs
// is_sorted_until
template <class _ForwardIterator, class _Compare>
-_ForwardIterator
+_LIBCPP_CONSTEXPR_AFTER_CXX17 _ForwardIterator
is_sorted_until(_ForwardIterator __first, _ForwardIterator __last, _Compare
__comp)
{
if (__first != __last)
@@ -3656,7 +3651,7 @@ is_sorted_until(_ForwardIterator __first
}
template<class _ForwardIterator>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
_ForwardIterator
is_sorted_until(_ForwardIterator __first, _ForwardIterator __last)
{
@@ -3666,7 +3661,7 @@ is_sorted_until(_ForwardIterator __first
// is_sorted
template <class _ForwardIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
bool
is_sorted(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
{
@@ -3674,7 +3669,7 @@ is_sorted(_ForwardIterator __first, _For
}
template<class _ForwardIterator>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
bool
is_sorted(_ForwardIterator __first, _ForwardIterator __last)
{
@@ -4834,7 +4829,7 @@ stable_sort(_RandomAccessIterator __firs
// is_heap_until
template <class _RandomAccessIterator, class _Compare>
-_RandomAccessIterator
+_LIBCPP_CONSTEXPR_AFTER_CXX17 _RandomAccessIterator
is_heap_until(_RandomAccessIterator __first, _RandomAccessIterator __last,
_Compare __comp)
{
typedef typename
_VSTD::iterator_traits<_RandomAccessIterator>::difference_type difference_type;
@@ -4861,7 +4856,7 @@ is_heap_until(_RandomAccessIterator __fi
}
template<class _RandomAccessIterator>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
_RandomAccessIterator
is_heap_until(_RandomAccessIterator __first, _RandomAccessIterator __last)
{
@@ -4871,7 +4866,7 @@ is_heap_until(_RandomAccessIterator __fi
// is_heap
template <class _RandomAccessIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
bool
is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare
__comp)
{
@@ -4879,7 +4874,7 @@ is_heap(_RandomAccessIterator __first, _
}
template<class _RandomAccessIterator>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
bool
is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
{
Modified:
libcxx/trunk/test/std/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp?rev=322489&r1=322488&r2=322489&view=diff
==============================================================================
---
libcxx/trunk/test/std/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp
(original)
+++
libcxx/trunk/test/std/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp
Mon Jan 15 08:16:32 2018
@@ -10,7 +10,7 @@
// <algorithm>
// template <class InputIterator, class Predicate>
-// bool
+// constpexr bool // constexpr after C++17
// is_partitioned(InputIterator first, InputIterator last, Predicate pred);
#include <algorithm>
@@ -18,13 +18,24 @@
#include <cstddef>
#include <cassert>
+#include "test_macros.h"
#include "test_iterators.h"
#include "counting_predicates.hpp"
struct is_odd {
- bool operator()(const int &i) const { return i & 1; }
+ TEST_CONSTEXPR bool operator()(const int &i) const { return i & 1; }
};
+#if TEST_STD_VER > 17
+TEST_CONSTEXPR int test_constexpr() {
+ int ia[] = {1, 3, 5, 2, 4, 6};
+ int ib[] = {1, 2, 3, 4, 5, 6};
+ return std::is_partitioned(std::begin(ia), std::end(ia), is_odd())
+ && !std::is_partitioned(std::begin(ib), std::end(ib), is_odd());
+ }
+#endif
+
+
int main() {
{
const int ia[] = {1, 2, 3, 4, 5, 6};
@@ -80,4 +91,8 @@ int main() {
assert(static_cast<std::ptrdiff_t>(pred.count()) <=
std::distance(std::begin(ia), std::end(ia)));
}
+
+#if TEST_STD_VER > 17
+ static_assert(test_constexpr());
+#endif
}
Modified:
libcxx/trunk/test/std/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation.pass.cpp?rev=322489&r1=322488&r2=322489&view=diff
==============================================================================
---
libcxx/trunk/test/std/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation.pass.cpp
(original)
+++
libcxx/trunk/test/std/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation.pass.cpp
Mon Jan 15 08:16:32 2018
@@ -10,7 +10,7 @@
// <algorithm>
// template<class ForwardIterator1, class ForwardIterator2>
-// bool
+// constexpr bool // constexpr after C++17
// is_permutation(ForwardIterator1 first1, ForwardIterator1 last1,
// ForwardIterator2 first2);
@@ -21,6 +21,21 @@
#include "test_macros.h"
+#if TEST_STD_VER > 17
+TEST_CONSTEXPR int test_constexpr() {
+ int ia[] = {0, 0, 0};
+ int ib[] = {1, 1, 0};
+ int ic[] = {1, 0, 1};
+ int id[] = {1};
+ return !std::is_permutation(std::begin(ia), std::end(ia), std::begin(ib))
+ && !std::is_permutation(std::begin(ia), std::end(ia), std::begin(ib),
std::end(ib))
+ && std::is_permutation(std::begin(ib), std::end(ib), std::begin(ic))
+ && std::is_permutation(std::begin(ib), std::end(ib), std::begin(ic),
std::end(ic))
+ && !std::is_permutation(std::begin(ic), std::end(ic), std::begin(id),
std::end(id))
+ ;
+ }
+#endif
+
int main()
{
{
@@ -600,4 +615,8 @@ int main()
forward_iterator<const int*>(ib + sa)) ==
false);
#endif
}
+
+#if TEST_STD_VER > 17
+ static_assert(test_constexpr());
+#endif
}
Modified:
libcxx/trunk/test/std/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation_pred.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation_pred.pass.cpp?rev=322489&r1=322488&r2=322489&view=diff
==============================================================================
---
libcxx/trunk/test/std/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation_pred.pass.cpp
(original)
+++
libcxx/trunk/test/std/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation_pred.pass.cpp
Mon Jan 15 08:16:32 2018
@@ -10,7 +10,7 @@
// <algorithm>
// template<class ForwardIterator1, class ForwardIterator2, class
BinaryPredicate>
-// bool
+// constexpr bool // constexpr after C++17
// is_permutation(ForwardIterator1 first1, ForwardIterator1 last1,
// ForwardIterator2 first2, BinaryPredicate pred);
@@ -28,6 +28,21 @@ bool counting_equals ( const T &a, const
return a == b;
}
+#if TEST_STD_VER > 17
+TEST_CONSTEXPR int test_constexpr() {
+ int ia[] = {0, 0, 0};
+ int ib[] = {1, 1, 0};
+ int ic[] = {1, 0, 1};
+ int id[] = {1};
+ std::equal_to<int> c;
+ return !std::is_permutation(std::begin(ia), std::end(ia), std::begin(ib)
, c)
+ && !std::is_permutation(std::begin(ia), std::end(ia), std::begin(ib),
std::end(ib), c)
+ && std::is_permutation(std::begin(ib), std::end(ib), std::begin(ic)
, c)
+ && std::is_permutation(std::begin(ib), std::end(ib), std::begin(ic),
std::end(ic), c)
+ && !std::is_permutation(std::begin(ic), std::end(ic), std::begin(id),
std::end(id), c)
+ ;
+ }
+#endif
int main()
{
@@ -723,4 +738,8 @@ int main()
std::equal_to<const int>()) == false);
#endif
}
+
+#if TEST_STD_VER > 17
+ static_assert(test_constexpr());
+#endif
}
Modified:
libcxx/trunk/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap.pass.cpp?rev=322489&r1=322488&r2=322489&view=diff
==============================================================================
---
libcxx/trunk/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap.pass.cpp
(original)
+++
libcxx/trunk/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap.pass.cpp
Mon Jan 15 08:16:32 2018
@@ -11,12 +11,23 @@
// template<RandomAccessIterator Iter>
// requires LessThanComparable<Iter::value_type>
-// bool
+// constexpr bool // constexpr after C++17
// is_heap(Iter first, Iter last);
#include <algorithm>
#include <cassert>
+#include "test_macros.h"
+
+#if TEST_STD_VER > 17
+TEST_CONSTEXPR int test_constexpr() {
+ int ia[] = {1, 1, 1, 1, 0, 1, 1};
+ int ib[] = {0, 0, 1, 0, 0, 0, 0};
+ return std::is_heap(std::begin(ia), std::end(ia))
+ && !std::is_heap(std::begin(ib), std::end(ib));
+ }
+#endif
+
void test()
{
int i1[] = {0, 0};
@@ -518,4 +529,8 @@ void test()
int main()
{
test();
+
+#if TEST_STD_VER > 17
+ static_assert(test_constexpr());
+#endif
}
Modified:
libcxx/trunk/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_comp.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_comp.pass.cpp?rev=322489&r1=322488&r2=322489&view=diff
==============================================================================
---
libcxx/trunk/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_comp.pass.cpp
(original)
+++
libcxx/trunk/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_comp.pass.cpp
Mon Jan 15 08:16:32 2018
@@ -11,13 +11,24 @@
// template<RandomAccessIterator Iter>
// requires LessThanComparable<Iter::value_type>
-// bool
+// constexpr bool // constexpr after C++17
// is_heap(Iter first, Iter last);
#include <algorithm>
#include <functional>
#include <cassert>
+#include "test_macros.h"
+
+#if TEST_STD_VER > 17
+TEST_CONSTEXPR int test_constexpr() {
+ int ia[] = {0, 0, 1, 1, 1};
+ int ib[] = {1, 0, 4, 1, 0};
+ return std::is_heap(std::begin(ia), std::end(ia), std::greater<int>())
+ && !std::is_heap(std::begin(ib), std::end(ib), std::greater<int>());
+ }
+#endif
+
void test()
{
int i1[] = {0, 0};
@@ -519,4 +530,8 @@ void test()
int main()
{
test();
+
+#if TEST_STD_VER > 17
+ static_assert(test_constexpr());
+#endif
}
Modified:
libcxx/trunk/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until.pass.cpp?rev=322489&r1=322488&r2=322489&view=diff
==============================================================================
---
libcxx/trunk/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until.pass.cpp
(original)
+++
libcxx/trunk/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until.pass.cpp
Mon Jan 15 08:16:32 2018
@@ -11,12 +11,23 @@
// template<RandomAccessIterator Iter>
// requires LessThanComparable<Iter::value_type>
-// Iter
+// constexpr bool // constexpr after C++17
// is_heap_until(Iter first, Iter last);
#include <algorithm>
#include <cassert>
+#include "test_macros.h"
+
+#if TEST_STD_VER > 17
+TEST_CONSTEXPR int test_constexpr() {
+ int ia[] = {0, 0, 0, 0, 1, 0};
+ int ib[] = {0, 0, 0, 1, 1, 1};
+ return (std::is_heap_until(std::begin(ia), std::end(ia)) == ia+4)
+ && (std::is_heap_until(std::begin(ib), std::end(ib)) == ib+3);
+ }
+#endif
+
void test()
{
int i1[] = {0, 0};
@@ -518,4 +529,8 @@ void test()
int main()
{
test();
+
+#if TEST_STD_VER > 17
+ static_assert(test_constexpr());
+#endif
}
Modified:
libcxx/trunk/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until_comp.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until_comp.pass.cpp?rev=322489&r1=322488&r2=322489&view=diff
==============================================================================
---
libcxx/trunk/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until_comp.pass.cpp
(original)
+++
libcxx/trunk/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until_comp.pass.cpp
Mon Jan 15 08:16:32 2018
@@ -11,13 +11,24 @@
// template<RandomAccessIterator Iter, StrictWeakOrder<auto, Iter::value_type>
Compare>
// requires CopyConstructible<Compare>
-// Iter
+// constexpr bool // constexpr after C++17
// is_heap_until(Iter first, Iter last, Compare comp);
#include <algorithm>
#include <functional>
#include <cassert>
+#include "test_macros.h"
+
+#if TEST_STD_VER > 17
+TEST_CONSTEXPR int test_constexpr() {
+ int ia[] = {1, 0, 0, 0};
+ int ib[] = {0, 1, 1, 0};
+ return (std::is_heap_until(std::begin(ia), std::end(ia),
std::greater<int>()) == ia+1)
+ && (std::is_heap_until(std::begin(ib), std::end(ib),
std::greater<int>()) == ib+3);
+ }
+#endif
+
void test()
{
int i1[] = {0, 0};
@@ -519,4 +530,8 @@ void test()
int main()
{
test();
+
+#if TEST_STD_VER > 17
+ static_assert(test_constexpr());
+#endif
}
Modified:
libcxx/trunk/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp?rev=322489&r1=322488&r2=322489&view=diff
==============================================================================
---
libcxx/trunk/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp
(original)
+++
libcxx/trunk/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp
Mon Jan 15 08:16:32 2018
@@ -19,6 +19,15 @@
#include "test_iterators.h"
+#if TEST_STD_VER > 17
+TEST_CONSTEXPR int test_constexpr() {
+ int ia[] = {0, 0, 1, 1};
+ int ib[] = {1, 1, 0, 0};
+ return std::is_sorted(std::begin(ia), std::end(ia))
+ && !std::is_sorted(std::begin(ib), std::end(ib));
+ }
+#endif
+
template <class Iter>
void
test()
@@ -180,4 +189,8 @@ int main()
test<bidirectional_iterator<const int*> >();
test<random_access_iterator<const int*> >();
test<const int*>();
+
+#if TEST_STD_VER > 17
+ static_assert(test_constexpr());
+#endif
}
Modified:
libcxx/trunk/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp?rev=322489&r1=322488&r2=322489&view=diff
==============================================================================
---
libcxx/trunk/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp
(original)
+++
libcxx/trunk/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp
Mon Jan 15 08:16:32 2018
@@ -20,6 +20,15 @@
#include "test_iterators.h"
+#if TEST_STD_VER > 17
+TEST_CONSTEXPR int test_constexpr() {
+ int ia[] = {1, 1, 0, 0};
+ int ib[] = {0, 0, 1, 1};
+ return std::is_sorted(std::begin(ia), std::end(ia),
std::greater<int>())
+ && !std::is_sorted(std::begin(ib), std::end(ib),
std::greater<int>());
+ }
+#endif
+
template <class Iter>
void
test()
@@ -181,4 +190,8 @@ int main()
test<bidirectional_iterator<const int*> >();
test<random_access_iterator<const int*> >();
test<const int*>();
+
+#if TEST_STD_VER > 17
+ static_assert(test_constexpr());
+#endif
}
Modified:
libcxx/trunk/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp?rev=322489&r1=322488&r2=322489&view=diff
==============================================================================
---
libcxx/trunk/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp
(original)
+++
libcxx/trunk/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp
Mon Jan 15 08:16:32 2018
@@ -19,6 +19,15 @@
#include "test_iterators.h"
+#if TEST_STD_VER > 17
+TEST_CONSTEXPR int test_constexpr() {
+ int ia[] = {0, 1, 0};
+ int ib[] = {0, 1, 1};
+ return (std::is_sorted_until(std::begin(ia), std::end(ia)) == ia+2)
+ && (std::is_sorted_until(std::begin(ib), std::end(ib)) == ib+3);
+ }
+#endif
+
template <class Iter>
void
test()
@@ -180,4 +189,8 @@ int main()
test<bidirectional_iterator<const int*> >();
test<random_access_iterator<const int*> >();
test<const int*>();
+
+#if TEST_STD_VER > 17
+ static_assert(test_constexpr());
+#endif
}
Modified:
libcxx/trunk/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp?rev=322489&r1=322488&r2=322489&view=diff
==============================================================================
---
libcxx/trunk/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp
(original)
+++
libcxx/trunk/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp
Mon Jan 15 08:16:32 2018
@@ -20,6 +20,15 @@
#include "test_iterators.h"
+#if TEST_STD_VER > 17
+TEST_CONSTEXPR int test_constexpr() {
+ int ia[] = {1, 0, 1};
+ int ib[] = {1, 1, 0};
+ return (std::is_sorted_until(std::begin(ia), std::end(ia),
std::greater<int>()) == ia+2)
+ && (std::is_sorted_until(std::begin(ib), std::end(ib),
std::greater<int>()) == ib+3);
+ }
+#endif
+
template <class Iter>
void
test()
@@ -181,4 +190,8 @@ int main()
test<bidirectional_iterator<const int*> >();
test<random_access_iterator<const int*> >();
test<const int*>();
+
+#if TEST_STD_VER > 17
+ static_assert(test_constexpr());
+#endif
}
Modified: libcxx/trunk/www/cxx2a_status.html
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/www/cxx2a_status.html?rev=322489&r1=322488&r2=322489&view=diff
==============================================================================
--- libcxx/trunk/www/cxx2a_status.html (original)
+++ libcxx/trunk/www/cxx2a_status.html Mon Jan 15 08:16:32 2018
@@ -60,12 +60,12 @@
<tr><td></td><td></td><td></td><td></td><td></td><td></td></tr>
<tr><td><a
href="https://wg21.link/P0020R6";>P0020R6</a></td><td>LWG</td><td>Floating Point
Atomic</td><td>Albuquerque</td><td></td><td></td></tr>
<tr><td><a
href="https://wg21.link/P0053R7";>P0053R7</a></td><td>LWG</td><td>C++
Synchronized Buffered Ostream</td><td>Albuquerque</td><td></td><td></td></tr>
- <tr><td><a
href="https://wg21.link/P0202R3";>P0202R3</a></td><td>LWG</td><td>Add constexpr
modifiers to functions in <algorithm> and <utility>
Headers</td><td>Albuquerque</td><td></td><td></td></tr>
+ <tr><td><a
href="https://wg21.link/P0202R3";>P0202R3</a></td><td>LWG</td><td>Add constexpr
modifiers to functions in <algorithm> and <utility>
Headers</td><td>Albuquerque</td><td><I>In Progress</I></td><td>7.0</td></tr>
<tr><td><a
href="https://wg21.link/P0415R1";>P0415R1</a></td><td>LWG</td><td>Constexpr for
<tt>std::complex</tt></td><td>Albuquerque</td><td></td><td></td></tr>
<tr><td><a
href="https://wg21.link/P0439R0";>P0439R0</a></td><td>LWG</td><td>Make
<tt>std::memory_order</tt> a scoped
enumeration</td><td>Albuquerque</td><td></td><td></td></tr>
<tr><td><a
href="https://wg21.link/P0457R2";>P0457R2</a></td><td>LWG</td><td>String Prefix
and Suffix Checking</td><td>Albuquerque</td><td>Complete</td><td>6.0</td></tr>
<tr><td><a
href="https://wg21.link/P0550R2";>P0550R2</a></td><td>LWG</td><td>Transformation
Trait
<tt>remove_cvref</tt></td><td>Albuquerque</td><td>Complete</td><td>6.0</td></tr>
- <tr><td><a
href="https://wg21.link/P0600R1";>P0600R1</a></td><td>LWG</td><td>nodiscard in
the Library</td><td>Albuquerque</td><td><I>In Progress</I></td><td></td></tr>
+ <tr><td><a
href="https://wg21.link/P0600R1";>P0600R1</a></td><td>LWG</td><td>nodiscard in
the Library</td><td>Albuquerque</td><td><I>In Progress</I></td><td>7.0</td></tr>
<tr><td><a
href="https://wg21.link/P0616R0";>P0616R0</a></td><td>LWG</td><td>de-pessimize
legacy <numeric> algorithms with
std::move</td><td>Albuquerque</td><td></td><td></td></tr>
<tr><td><a
href="https://wg21.link/P0653R2";>P0653R2</a></td><td>LWG</td><td>Utility to
convert a pointer to a raw
pointer</td><td>Albuquerque</td><td>Complete</td><td>6.0</td></tr>
<tr><td><a
href="https://wg21.link/P0718R2";>P0718R2</a></td><td>LWG</td><td>Atomic
shared_ptr</td><td>Albuquerque</td><td></td><td></td></tr>
@@ -132,7 +132,7 @@
<!-- <tr><td></td><td></td><td></td><td></td></tr> -->
</table>
- <p>Last Updated: 16-Jul-2017</p>
+ <p>Last Updated: 15-Jan-2018</p>
</div>
</body>
</html>
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
