From f710ca61baca6ba7b6e513b68a9397e7b635989f Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Fri, 19 May 2017 13:11:31 +0100
Subject: [PATCH] PR libstdc++/80796 Add new std::search overload for C++17
PR libstdc++/80796
* include/bits/stl_algo.h (search): Add new overload for C++17.
* testsuite/25_algorithms/search/searcher.cc: New.
From-SVN: r248266
---
libstdc++-v3/ChangeLog | 6 +++
libstdc++-v3/include/bits/stl_algo.h | 14 ++++++
.../25_algorithms/search/searcher.cc | 47 +++++++++++++++++++
3 files changed, 67 insertions(+)
create mode 100644 libstdc++-v3/testsuite/25_algorithms/search/searcher.cc
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ae457263395d..ef4e3839faf4 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2017-05-19 Jonathan Wakely <jwakely@redhat.com>
+
+ PR libstdc++/80796
+ * include/bits/stl_algo.h (search): Add new overload for C++17.
+ * testsuite/25_algorithms/search/searcher.cc: New.
+
2017-05-18 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/80478
diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h
index aaa4eefbe9a7..246193f38c7f 100644
--- a/libstdc++-v3/include/bits/stl_algo.h
+++ b/libstdc++-v3/include/bits/stl_algo.h
@@ -4258,6 +4258,20 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
__gnu_cxx::__ops::__iter_comp_val(__binary_pred, __val));
}
+#if __cplusplus > 201402L
+ /** @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
/**
* @brief Perform an operation on a sequence.
diff --git a/libstdc++-v3/testsuite/25_algorithms/search/searcher.cc b/libstdc++-v3/testsuite/25_algorithms/search/searcher.cc
new file mode 100644
index 000000000000..794cdb9a678e
--- /dev/null
+++ b/libstdc++-v3/testsuite/25_algorithms/search/searcher.cc
@@ -0,0 +1,47 @@
+// Copyright (C) 2017 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library. This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3. If not see
+// <http://www.gnu.org/licenses/>.
+
+// { dg-options "-std=gnu++17" }
+// { dg-do run { target c++1z } }
+
+#include <algorithm>
+#include <testsuite_hooks.h>
+
+struct nocopy
+{
+ nocopy() = default;
+ nocopy(const nocopy&) = delete;
+ nocopy& operator=(const nocopy&) = delete;
+
+ struct P { int* first; };
+
+ P operator()(int* f, int* l) const { return {f}; }
+};
+
+void
+test01()
+{
+ int i[] = { 1, 2 };
+ auto res = std::search(i, i + 2, nocopy{});
+ VERIFY( res == i );
+}
+
+int
+main()
+{
+ test01();
+}
--
GitLab