stl_algo.h (find_first_of(,,,,pred)): Remove invalid EqualOpConcept.

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.

From-SVN: r89853

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f716244fe18bf72288f7bbf454369caae2e3522c..c50feaf0777dbcd7d1956598ccfad6a063853a2e 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
 2004-10-29  Benjamin Kosnik  <bkoz@redhat.com>
 
        * testsuite/testsuite_allocator.h (check_delete): New.

diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h
index 658a13435d2e0e31d1f1fff5ae00cd7ea7a4a274..f568a0671e3a287298c273a4dce44a31265fdcc1 100644 (file)
--- a/libstdc++-v3/include/bits/stl_algo.h
+++ b/libstdc++-v3/include/bits/stl_algo.h
@@ -4923,9 +4923,6 @@ namespace std
       // 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 --git a/libstdc++-v3/testsuite/25_algorithms/find_first_of/concept_check_1.cc b/libstdc++-v3/testsuite/25_algorithms/find_first_of/concept_check_1.cc
new file mode 100644 (file)
index 0000000..fabfbf9
--- /dev/null
+++ b/libstdc++-v3/testsuite/25_algorithms/find_first_of/concept_check_1.cc
@@ -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;
+}