aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2020-11-04 13:36:32 +0000
committerJonathan Wakely <jwakely@redhat.com>2020-11-04 13:36:32 +0000
commite0af865ab9d9d5b6b3ac7fdde26cf9bbf635b6b4 (patch)
tree213d7d0316af11d52963aa53c6d87f76bc738042
parent243492e2c69741b91dbfe3bba9b772f65fc9354c (diff)
downloadgcc-e0af865ab9d9d5b6b3ac7fdde26cf9bbf635b6b4.zip
gcc-e0af865ab9d9d5b6b3ac7fdde26cf9bbf635b6b4.tar.gz
gcc-e0af865ab9d9d5b6b3ac7fdde26cf9bbf635b6b4.tar.bz2
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.
-rw-r--r--libstdc++-v3/include/bits/stl_algo.h2
-rw-r--r--libstdc++-v3/include/parallel/algo.h15
2 files changed, 16 insertions, 1 deletions
diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h
index 621c633..6efc990 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 cec6fd0..4b6dcc8 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<typename _ForwardIterator, typename _Searcher>
+ inline _ForwardIterator
+ search(_ForwardIterator __first, _ForwardIterator __last,
+ const _Searcher& __searcher)
+ { return __searcher(__first, __last).first; }
+#endif
+
// Sequential fallback
template<typename _FIterator, typename _Integer, typename _Tp>
inline _FIterator