From e0af865ab9d9d5b6b3ac7fdde26cf9bbf635b6b4 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 4 Nov 2020 13:36:32 +0000 Subject: [PATCH] libstdc++: Define new C++17 std::search overload for Parallel Mode [PR 94971] libstdc++-v3/ChangeLog: PR libstdc++/94971 * include/bits/stl_algo.h (search(FIter, FIter, const Searcher): Adjust #if condition. * include/parallel/algo.h (search(FIter, FIter, const Searcher&): Define new overload for C++17. --- libstdc++-v3/include/bits/stl_algo.h | 2 +- libstdc++-v3/include/parallel/algo.h | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h index 621c6331422..6efc99035b7 100644 --- a/libstdc++-v3/include/bits/stl_algo.h +++ b/libstdc++-v3/include/bits/stl_algo.h @@ -4243,7 +4243,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO __gnu_cxx::__ops::__iter_comp_val(__binary_pred, __val)); } -#if __cplusplus > 201402L +#if __cplusplus >= 201703L /** @brief Search a sequence using a Searcher object. * * @param __first A forward iterator. diff --git a/libstdc++-v3/include/parallel/algo.h b/libstdc++-v3/include/parallel/algo.h index cec6fd003c3..4b6dcc84119 100644 --- a/libstdc++-v3/include/parallel/algo.h +++ b/libstdc++-v3/include/parallel/algo.h @@ -1049,6 +1049,21 @@ namespace __parallel std::__iterator_category(__begin2)); } +#if __cplusplus >= 201703L + /** @brief Search a sequence using a Searcher object. + * + * @param __first A forward iterator. + * @param __last A forward iterator. + * @param __searcher A callable object. + * @return @p __searcher(__first,__last).first + */ + template + inline _ForwardIterator + search(_ForwardIterator __first, _ForwardIterator __last, + const _Searcher& __searcher) + { return __searcher(__first, __last).first; } +#endif + // Sequential fallback template inline _FIterator -- 2.30.2