obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

1 files changed, 82 insertions, 0 deletions

diff --git a/libstdc++-v3/testsuite/ext/concept_checks.cc b/libstdc++-v3/testsuite/ext/concept_checks.cc
new file mode 100644
index 000000000..158a91479
--- /dev/null
+++ b/libstdc++-v3/testsuite/ext/concept_checks.cc
@@ -0,0 +1,82 @@
+// 2001-12-28  Phil Edwards  <pme@gcc.gnu.org>
+//
+// Copyright (C) 2001, 2002, 2004, 2005, 2009 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/>.
+
+// Concept checking must remain sane.
+
+// { dg-options "-D_GLIBCXX_CONCEPT_CHECKS" }
+
+#include <vector>
+#include <string>
+#include <algorithm>
+#include <testsuite_hooks.h>
+
+using namespace std;
+
+
+// PR libstdc++/2054 and follow-up discussion
+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;
+  }
+
+  bool operator()( const string& a, int x) 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);
+  upper_bound(Index.begin(), Index.end(), SearchTerm, aComparison);
+  equal_range(Index.begin(), Index.end(), SearchTerm, aComparison);
+  binary_search(Index.begin(), Index.end(), SearchTerm, aComparison);
+}
+
+int main()
+{
+  test2054();
+  return 0;
+}