From be3996918fa6ab11da8e1a9a78e2fa54af428f1a Mon Sep 17 00:00:00 2001
From: Phil Edwards <pme@gcc.gnu.org>
Date: Fri, 28 Dec 2001 21:57:47 +0000
Subject: [PATCH] re PR libstdc++/2054 (g++-3 rejects legal code, accepted by
 g++-2.95.2 (functors))

2001-12-28  Phil Edwards  <pme@gcc.gnu.org>

	PR libstdc++/2054
	* include/bits/stl_algo.h (lower_bound):  Relax concept checks.
	* testsuite/ext/concept_checks.cc:  New file.

From-SVN: r48351
---
 libstdc++-v3/ChangeLog                       |  6 ++
 libstdc++-v3/include/bits/stl_algo.h         |  3 +-
 libstdc++-v3/testsuite/ext/concept_checks.cc | 76 ++++++++++++++++++++
 3 files changed, 83 insertions(+), 2 deletions(-)
 create mode 100644 libstdc++-v3/testsuite/ext/concept_checks.cc

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f28b8cc227c..1b9449dbc71 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-28  Phil Edwards  <pme@gcc.gnu.org>
+
+	PR libstdc++/2054
+	* include/bits/stl_algo.h (lower_bound):  Relax concept checks.
+	* testsuite/ext/concept_checks.cc:  New file.
+
 2001-12-28  Paolo Carlini  <pcarlini@unitus.it>
 
 	* include/bits/stl_algo.h (count returning void,
diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h
index 1bcd98f6c40..d5694b26f19 100644
--- a/libstdc++-v3/include/bits/stl_algo.h
+++ b/libstdc++-v3/include/bits/stl_algo.h
@@ -1982,8 +1982,7 @@ __result, __binary_pred, _IterType());
       
       // concept requirements
       __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>)
-      __glibcpp_function_requires(_SameTypeConcept<_Tp, _ValueType>)
-      __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, _Tp, _Tp>)
+      __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, _ValueType, _Tp>)
     
       _DistanceType __len = distance(__first, __last);
       _DistanceType __half;
diff --git a/libstdc++-v3/testsuite/ext/concept_checks.cc b/libstdc++-v3/testsuite/ext/concept_checks.cc
new file mode 100644
index 00000000000..d07beba3287
--- /dev/null
+++ b/libstdc++-v3/testsuite/ext/concept_checks.cc
@@ -0,0 +1,76 @@
+// 2001-12-28  Phil Edwards  <pme@gcc.gnu.org>
+//
+// Copyright (C) 2001 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.
+
+// Concept checking must remain sane.
+
+// { dg-options "-D_GLIBCPP_CONCEPT_CHECKS" }
+
+#include <vector>
+#include <string>
+#include <algorithm>
+#include <testsuite_hooks.h>
+
+using namespace std;
+
+
+// PR libstdc++/2054
+struct indirectCompare
+{
+  indirectCompare(const vector<string>& v) : V(v) {}
+
+  bool operator()( int x,  int y) const
+  {
+       return V[x] < V[y];
+  }
+
+  bool operator()( int x, const string& a) const
+  {
+       return V[x] < a;
+  }
+
+  const vector<string>& V;
+};
+
+void
+test2054( )
+{
+  const int Maxi = 1022;
+
+  vector<string> Words(Maxi);
+  vector<int> Index(Maxi);
+
+  for(size_t i = 0; i < Index.size(); i++)
+     Index[i] = i;
+
+  indirectCompare aComparison(Words);
+
+  sort(Index.begin(), Index.end(), aComparison);
+
+  string SearchTerm;
+
+  lower_bound(Index.begin(), Index.end(), SearchTerm, aComparison);
+}
+
+int main()
+{
+  test2054();
+
+  return 0;
+}