diff mbox series

[committed] libstdc++: Define new C++17 std::search overload for Parallel Mode [PR 94971]

Message ID 20201104133644.GA3201906@redhat.com
State New
Headers show
Series [committed] libstdc++: Define new C++17 std::search overload for Parallel Mode [PR 94971] | expand

Commit Message

Jonathan Wakely Nov. 4, 2020, 1:36 p.m. UTC 
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.

Tested powerpc64le-linux. Committed to trunk.
commit e0af865ab9d9d5b6b3ac7fdde26cf9bbf635b6b4
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Wed Nov 4 13:36:32 2020

    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.
diff mbox series

Patch

diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h
index 621c6331422e..6efc99035b7d 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 cec6fd003c38..4b6dcc841191 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