257831582c
We were only checking that the comparator was rvalue callable, when in reality the algorithms always call comparators as lvalues. This patch also refactors the tests for callable requirements and expands it to a few missing algorithms. This is take 2 of #73451, which was reverted because it broke some CI bots. The issue was that we checked __is_callable with arguments in the wrong order inside std::upper_bound. This has now been fixed and a test was added. Fixes #69554
55 lines
2.0 KiB
C++
55 lines
2.0 KiB
C++
//===----------------------------------------------------------------------===//
|
|
//
|
|
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#ifndef _LIBCPP___ALGORITHM_MAX_ELEMENT_H
|
|
#define _LIBCPP___ALGORITHM_MAX_ELEMENT_H
|
|
|
|
#include <__algorithm/comp.h>
|
|
#include <__algorithm/comp_ref_type.h>
|
|
#include <__config>
|
|
#include <__iterator/iterator_traits.h>
|
|
#include <__type_traits/is_callable.h>
|
|
|
|
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
|
|
# pragma GCC system_header
|
|
#endif
|
|
|
|
_LIBCPP_BEGIN_NAMESPACE_STD
|
|
|
|
template <class _Compare, class _ForwardIterator>
|
|
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _ForwardIterator
|
|
__max_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp) {
|
|
static_assert(
|
|
__has_forward_iterator_category<_ForwardIterator>::value, "std::max_element requires a ForwardIterator");
|
|
if (__first != __last) {
|
|
_ForwardIterator __i = __first;
|
|
while (++__i != __last)
|
|
if (__comp(*__first, *__i))
|
|
__first = __i;
|
|
}
|
|
return __first;
|
|
}
|
|
|
|
template <class _ForwardIterator, class _Compare>
|
|
_LIBCPP_NODISCARD inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _ForwardIterator
|
|
max_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp) {
|
|
static_assert(
|
|
__is_callable<_Compare&, decltype(*__first), decltype(*__first)>::value, "The comparator has to be callable");
|
|
return std::__max_element<__comp_ref_type<_Compare> >(__first, __last, __comp);
|
|
}
|
|
|
|
template <class _ForwardIterator>
|
|
_LIBCPP_NODISCARD inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _ForwardIterator
|
|
max_element(_ForwardIterator __first, _ForwardIterator __last) {
|
|
return std::max_element(__first, __last, __less<>());
|
|
}
|
|
|
|
_LIBCPP_END_NAMESPACE_STD
|
|
|
|
#endif // _LIBCPP___ALGORITHM_MAX_ELEMENT_H
|