This is the mail archive of the
libstdc++@gcc.gnu.org
mailing list for the libstdc++ project.
Remove invalid check in find_first_of
- From: Chris Jefferson <caj at cs dot york dot ac dot uk>
- To: libstdc++ at gcc dot gnu dot org
- Date: Thu, 28 Oct 2004 23:02:17 +0100
- Subject: Remove invalid check in find_first_of
Lets see if I can get a changelog and patch out perfectly this time!
std::find_first_of(iterator1, iterator1, iterator2, iterator2, predicate)
has a check to see if "*iterator1 == *iterator2" is valid. However, this
isn't actually necessasary, all we need is that predicate(*iterator1,
*iterator2) is valid (which is also checked for).
This patch therefore removes that invalid check.
// Copyright (C) 2000 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 2, 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 COPYING. If not, write to the Free
// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
// USA.
// { dg-do compile }
// { dg-options "-D_GLIBCXX_CONCEPT_CHECKS" }
#include <algorithm>
class class1
{ };
class class2
{ };
bool
comp(class1&, class2&)
{ return true; }
class1 a;
class2 b;
int
main()
{
std::find_first_of(&a, &a, &b, &b, comp);
}
2004-10-28 Chris Jefferson <chris@bubblescope.net>
* include/bit/stl_algo.h (find_first_of(,,,,pred)):
Remove invalid EqualOpConcept.
* testsuite/25_algorithms/find_first_of.cc: New.
Index: gcc/libstdc++-v3/include/bits/stl_algo.h
===================================================================
RCS file: /cvsroot/gcc/gcc/libstdc++-v3/include/bits/stl_algo.h,v
retrieving revision 1.49
diff -p -c -3 -r1.49 stl_algo.h
*** gcc/libstdc++-v3/include/bits/stl_algo.h 6 Oct 2004 09:06:58 -0000 1.49
--- gcc/libstdc++-v3/include/bits/stl_algo.h 28 Oct 2004 21:51:31 -0000
*************** namespace std
*** 4923,4931 ****
// concept requirements
__glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
__glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
- __glibcxx_function_requires(_EqualOpConcept<
- typename iterator_traits<_InputIterator>::value_type,
- typename iterator_traits<_ForwardIterator>::value_type>)
__glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
typename iterator_traits<_InputIterator>::value_type,
typename iterator_traits<_ForwardIterator>::value_type>)
--- 4923,4928 ----