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: r248267
This commit is contained in:
Jonathan Wakely 2017-05-19 13:28:28 +01:00 committed by Jonathan Wakely
parent 07276c2b61
commit ee791c3ab1
3 changed files with 67 additions and 0 deletions

View File

@ -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> 2017-05-18 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/80478 PR libstdc++/80478

View File

@ -4258,6 +4258,20 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
__gnu_cxx::__ops::__iter_comp_val(__binary_pred, __val)); __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. * @brief Perform an operation on a sequence.

View File

@ -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();
}