This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[v3] Fix a concept check bug
- From: Paolo Carlini <pcarlini at suse dot de>
- To: "'gcc-patches at gcc dot gnu dot org'" <gcc-patches at gcc dot gnu dot org>
- Date: Fri, 29 Oct 2004 23:47:17 +0200
- Subject: [v3] Fix a concept check bug
Hi,
contributed by Chris, tested x86-linux, committed.
Paolo.
//////////////
2004-10-29 Chris Jefferson <chris@bubblescope.net>
* include/bit/stl_algo.h (find_first_of(,,,,pred)):
Remove invalid EqualOpConcept.
* testsuite/25_algorithms/find_first_of/concept_check_1.cc: New.
diff -urN libstdc++-v3-orig/include/bits/stl_algo.h libstdc++-v3/include/bits/stl_algo.h
--- libstdc++-v3-orig/include/bits/stl_algo.h 2004-10-06 11:06:58.000000000 +0200
+++ libstdc++-v3/include/bits/stl_algo.h 2004-10-29 23:20:48.000000000 +0200
@@ -4923,9 +4923,6 @@
// 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>)
diff -urN libstdc++-v3-orig/testsuite/25_algorithms/find_first_of/concept_check_1.cc libstdc++-v3/testsuite/25_algorithms/find_first_of/concept_check_1.cc
--- libstdc++-v3-orig/testsuite/25_algorithms/find_first_of/concept_check_1.cc 1970-01-01 01:00:00.000000000 +0100
+++ libstdc++-v3/testsuite/25_algorithms/find_first_of/concept_check_1.cc 2004-10-29 23:28:06.000000000 +0200
@@ -0,0 +1,47 @@
+// Copyright (C) 2004 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;
+
+// http://gcc.gnu.org/ml/libstdc++/2004-10/msg00448.html
+void test01()
+{
+ std::find_first_of(&a, &a, &b, &b, comp);
+}
+
+int main()
+{
+ test01();
+ return 0;
+}