mirror of
git://gcc.gnu.org/git/gcc.git
synced 2025-04-04 14:31:29 +08:00
map_operators.cc: Add dg-excess-errors.
2001-04-17 Benjamin Kosnik <bkoz@redhat.com> * testsuite/23_containers/map_operators.cc: Add dg-excess-errors. * testsuite/23_containers/set_operators.cc: Same. * include/bits/c++config: Add _GLIBCPP_CONCEPT_CHECKS. Disable by default. (__GLIBCPP__): Bump from value of last release. * include/bits/concept_check.h: Default to off, edit comments. * src/stl-inst.cc: Use _GLIBCPP_CONCEPT_CHECKS. * src/Makefile.am (AM_CXXFLAGS): Remove _GLIBCPP_NO_CONCEPT_CHECKS. * src/Makefile.in: Regenerate. From-SVN: r41397
This commit is contained in:
Benjamin Kosnik
Benjamin Kosnik
parent
7848c23806
commit
47e982b247
@ -1,3 +1,16 @@
|
||||
2001-04-17 Benjamin Kosnik <bkoz@redhat.com>
|
||||
|
||||
* testsuite/23_containers/map_operators.cc: Add dg-excess-errors.
|
||||
* testsuite/23_containers/set_operators.cc: Same.
|
||||
|
||||
* include/bits/c++config: Add _GLIBCPP_CONCEPT_CHECKS. Disable by
|
||||
default.
|
||||
(__GLIBCPP__): Bump from value of last release.
|
||||
* include/bits/concept_check.h: Default to off, edit comments.
|
||||
* src/stl-inst.cc: Use _GLIBCPP_CONCEPT_CHECKS.
|
||||
* src/Makefile.am (AM_CXXFLAGS): Remove _GLIBCPP_NO_CONCEPT_CHECKS.
|
||||
* src/Makefile.in: Regenerate.
|
||||
|
||||
2001-04-14 Martin Reinecke <martin@MPA-Garching.MPG.DE>
|
||||
|
||||
* include/bits/boost_concept_check.h(_Mutable_ContainerConcept):
|
||||
|
||||
1529
libstdc++-v3/configure
vendored
1529
libstdc++-v3/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -34,7 +34,7 @@
|
||||
#include <bits/os_defines.h>
|
||||
|
||||
// The current version of the C++ library in compressed ISO date format.
|
||||
#define __GLIBCPP__ 20010406
|
||||
#define __GLIBCPP__ 20010417
|
||||
|
||||
// This is necessary until GCC supports separate template
|
||||
// compilation.
|
||||
@ -55,6 +55,9 @@
|
||||
// Use corrected code from the committee library group's issues list.
|
||||
#define _GLIBCPP_RESOLVE_LIB_DEFECTS 1
|
||||
|
||||
// Enable concept checking code from the boost libraries.
|
||||
//#define _GLIBCPP_CONCEPT_CHECKS 1
|
||||
|
||||
// From SGI's stl_config.h; generic settings and user hooks (_NOTHREADS).
|
||||
#if defined(_PTHREADS) && !defined(_NOTHREADS)
|
||||
# define __STL_PTHREADS
|
||||
@ -63,9 +66,6 @@
|
||||
# define __STL_UITHREADS
|
||||
#endif
|
||||
|
||||
// Concept-checking hooks and related config are now in bits/concept_check.h.
|
||||
|
||||
|
||||
// This is also a user hook, but via -f[no-]exceptions, not direct #defines.
|
||||
#ifdef __EXCEPTIONS
|
||||
# define __STL_USE_EXCEPTIONS
|
||||
@ -142,5 +142,3 @@
|
||||
|
||||
|
||||
// End of prewritten config; the discovered settings follow.
|
||||
|
||||
|
||||
|
||||
@ -31,29 +31,18 @@
|
||||
#define _GLIBCPP_CONCEPT_CHECK 1
|
||||
|
||||
#pragma GCC system_header
|
||||
|
||||
#include <bits/c++config.h>
|
||||
|
||||
|
||||
// Concept-checking code is on by default unless users turn it off via any
|
||||
// of these methods:
|
||||
// - _GLIBCPP_NO_CONCEPT_CHECKS is a user hook; defining it disables the
|
||||
// checks.
|
||||
// - _STL_NO_CONCEPT_CHECKS is a user hook from the old STL implementation
|
||||
// specifically for this purpose; defining it disables the checks, in
|
||||
// case the user is expecting the old version.
|
||||
// - NDEBUG is the usual macro that kills assert(). Defining it will also
|
||||
// disable the checks, by the reasoning that if the user doesn't want
|
||||
// any runtime assertion code, then no space penalty for the checks
|
||||
// is desired either.
|
||||
|
||||
// All places in libstdc++-v3 where these are used, or /might/ be used, or
|
||||
// don't need to be used, or perhaps /should/ be used, are commented with
|
||||
// "concept requirements" (and maybe some more text). So grep like crazy
|
||||
// if you're looking for additional places to use these.
|
||||
|
||||
// Concept-checking code is off by default unless users turn it on via
|
||||
// configure options or editing c++config.h.
|
||||
|
||||
#if defined(_GLIBCPP_NO_CONCEPT_CHECKS) || defined(_STL_NO_CONCEPT_CHECKS) \
|
||||
|| defined(NDEBUG)
|
||||
#ifndef _GLIBCPP_CONCEPT_CHECKS
|
||||
|
||||
#define __glibcpp_function_requires(...)
|
||||
#define __glibcpp_class_requires(_a,_b)
|
||||
@ -90,4 +79,3 @@
|
||||
#endif // enable/disable
|
||||
|
||||
#endif // _GLIBCPP_CONCEPT_CHECK
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
||||
## USA.
|
||||
|
||||
## $Id: Makefile.am,v 1.82 2001/04/06 06:08:17 bkoz Exp $
|
||||
## $Id: Makefile.am,v 1.83 2001/04/11 18:52:31 bkoz Exp $
|
||||
|
||||
AUTOMAKE_OPTIONS = 1.3 gnits
|
||||
MAINT_CHARSET = latin1
|
||||
@ -306,7 +306,7 @@ tmp-libstdc++.INC: Makefile
|
||||
# the concept-checking symbols. So we must disable the checks while
|
||||
# actually building the library.
|
||||
AM_CXXFLAGS = \
|
||||
-fno-implicit-templates -D_GLIBCPP_NO_CONCEPT_CHECKS \
|
||||
-fno-implicit-templates \
|
||||
$(LIBSUPCXX_CXXFLAGS) \
|
||||
$(WARN_CXXFLAGS) \
|
||||
$(OPTIMIZE_CXXFLAGS) \
|
||||
|
||||
@ -198,7 +198,7 @@ c_incdir = @C_INCLUDE_DIR@
|
||||
# The no-implicit-templates flag will generate unresolved references to
|
||||
# the concept-checking symbols. So we must disable the checks while
|
||||
# actually building the library.
|
||||
AM_CXXFLAGS = -fno-implicit-templates -D_GLIBCPP_NO_CONCEPT_CHECKS $(LIBSUPCXX_CXXFLAGS) $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS)
|
||||
AM_CXXFLAGS = -fno-implicit-templates $(LIBSUPCXX_CXXFLAGS) $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS)
|
||||
|
||||
|
||||
# libstdc++ libtool notes
|
||||
|
||||
@ -50,7 +50,7 @@ namespace std
|
||||
vector<unsigned int>::
|
||||
_M_insert_aux(vector<unsigned int>::iterator, unsigned int const &);
|
||||
|
||||
#ifdef __STL_USE_CONCEPT_CHECKS
|
||||
#ifdef _GLIBCPP_CONCEPT_CHECKS
|
||||
template
|
||||
void __sink_unused_warning<unsigned int>(unsigned int);
|
||||
|
||||
|
||||
@ -24,13 +24,10 @@
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
|
||||
// map and set
|
||||
// libstdc++/86: map & set iterator comparisons are not type-safe
|
||||
// XXX this is XFAIL for the time being, ie this should not compile
|
||||
|
||||
// Just try to compile
|
||||
// { dg-do compile }
|
||||
// { dg-excess-errors "" }
|
||||
|
||||
// libstdc++/86: map & set iterator comparisons are not type-safe
|
||||
void test01()
|
||||
{
|
||||
bool test = true;
|
||||
@ -43,8 +40,8 @@ void test01()
|
||||
std::map<unsigned, int>::iterator itr(mapByIndex.begin());
|
||||
|
||||
// NB: notice, it's not mapByIndex!!
|
||||
test &= itr != mapByName.end(); // { dg-error ".*" "" { xfail *-*-* } }
|
||||
test &= itr == mapByName.end(); // { dg-error ".*" "" { xfail *-*-* } }
|
||||
test &= itr != mapByName.end(); // { dg-error "match" "" { xfail *-*-* } }
|
||||
test &= itr == mapByName.end(); // { dg-error "match" "" { xfail *-*-* } }
|
||||
}
|
||||
|
||||
// http://gcc.gnu.org/ml/libstdc++/2000-11/msg00093.html
|
||||
|
||||
@ -22,12 +22,11 @@
|
||||
|
||||
#include <set>
|
||||
#include <string>
|
||||
|
||||
// map and set
|
||||
// libstdc++/86: map & set iterator comparisons are not type-safe
|
||||
|
||||
make
|
||||
// { dg-do compile }
|
||||
// { dg-excess-errors "" }
|
||||
|
||||
// libstdc++/86: map & set iterator comparisons are not type-safe
|
||||
int main(void)
|
||||
{
|
||||
bool test = true;
|
||||
@ -37,9 +36,11 @@ int main(void)
|
||||
|
||||
std::set<unsigned int>::iterator itr(setByIndex.begin());
|
||||
|
||||
// NB: it's not setByIndex!!
|
||||
test &= itr != setByName.end(); // { dg-error ".*" "" { xfail *-*-* } }
|
||||
test &= itr == setByName.end(); // { dg-error ".*" "" { xfail *-*-* } }
|
||||
|
||||
// NB: it's not setByIndex!!
|
||||
test &= itr != setByName.end();
|
||||
// { dg-error "no match for" "" { xfail *-*-* } 41 }
|
||||
test &= itr == setByName.end();
|
||||
// { dg-error "no match for" "" { xfail *-*-* } 43 }
|
||||
return 0;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user