diff options
Diffstat (limited to 'libcxx/include/experimental')
| -rw-r--r-- | libcxx/include/experimental/functional | 6 | ||||
| -rw-r--r-- | libcxx/include/experimental/simd | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/libcxx/include/experimental/functional b/libcxx/include/experimental/functional index 04f195d3cf24..12440744ca50 100644 --- a/libcxx/include/experimental/functional +++ b/libcxx/include/experimental/functional @@ -62,6 +62,7 @@ inline namespace fundamentals_v1 { #include <__assert> // all public C++ headers provide the assertion handler #include <__debug> +#include <__functional/identity.h> #include <__memory/uses_allocator.h> #include <array> #include <experimental/__config> @@ -104,9 +105,8 @@ public: pair<_ForwardIterator2, _ForwardIterator2> operator () (_ForwardIterator2 __f, _ForwardIterator2 __l) const { - return _VSTD::__search(__f, __l, __first_, __last_, __pred_, - typename iterator_traits<_ForwardIterator>::iterator_category(), - typename iterator_traits<_ForwardIterator2>::iterator_category()); + auto __proj = __identity(); + return std::__search_impl(__f, __l, __first_, __last_, __pred_, __proj, __proj); } private: diff --git a/libcxx/include/experimental/simd b/libcxx/include/experimental/simd index 9b55cc009986..f77ce59bb269 100644 --- a/libcxx/include/experimental/simd +++ b/libcxx/include/experimental/simd @@ -1242,32 +1242,32 @@ _Tp reduce(const simd<_Tp, _Abi>&, _BinaryOp = _BinaryOp()); template <class _MaskType, class _SimdType, class _BinaryOp> typename _SimdType::value_type reduce(const const_where_expression<_MaskType, _SimdType>&, - typename _SimdType::value_type neutral_element, _BinaryOp binary_op); + typename _SimdType::value_type __neutral_element, _BinaryOp); template <class _MaskType, class _SimdType> typename _SimdType::value_type reduce(const const_where_expression<_MaskType, _SimdType>&, - plus<typename _SimdType::value_type> binary_op = {}); + plus<typename _SimdType::value_type> = {}); template <class _MaskType, class _SimdType> typename _SimdType::value_type reduce(const const_where_expression<_MaskType, _SimdType>&, - multiplies<typename _SimdType::value_type> binary_op); + multiplies<typename _SimdType::value_type>); template <class _MaskType, class _SimdType> typename _SimdType::value_type reduce(const const_where_expression<_MaskType, _SimdType>&, - bit_and<typename _SimdType::value_type> binary_op); + bit_and<typename _SimdType::value_type>); template <class _MaskType, class _SimdType> typename _SimdType::value_type reduce(const const_where_expression<_MaskType, _SimdType>&, - bit_or<typename _SimdType::value_type> binary_op); + bit_or<typename _SimdType::value_type>); template <class _MaskType, class _SimdType> typename _SimdType::value_type reduce(const const_where_expression<_MaskType, _SimdType>&, - bit_xor<typename _SimdType::value_type> binary_op); + bit_xor<typename _SimdType::value_type>); template <class _Tp, class _Abi> _Tp hmin(const simd<_Tp, _Abi>&); |