OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Phil Edwards 2001-12-28 21:57:47 +00:00
parent 2c1bc4ebc9
commit be3996918f
3 changed files with 83 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -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,

3
libstdc++-v3/include/bits/stl_algo.h
View File

@ -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;

76
libstdc++-v3/testsuite/ext/concept_checks.cc Normal file
View File

@ -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;
}