This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
V3 PATCH: Disable concept-checking
- To: gcc-patches at gcc dot gnu dot org, libstdc++ at gcc dot gnu dot org
- Subject: V3 PATCH: Disable concept-checking
- From: Mark Mitchell <mark at codesourcery dot com>
- Date: Sun, 15 Apr 2001 17:29:09 -0700
- Organization: CodeSourcery, LLC
This patch turns off concept-checking on the branch.
Tested on i686-pc-linux-gnu.
--
Mark Mitchell mark@codesourcery.com
CodeSourcery, LLC http://www.codesourcery.com
2001-04-15 Mark Mitchell <mark@codesourcery.com>
* include/bits/stl_config.h: Turn off concept-checking.
* src/locale-inst.cc: Disable use of __sink_unused_warning when
concept-checking is disabled.
* src/misc-inst.cc: Likewise.
* src/stl-inst.cc: Likewise.
Index: libstdc++-v3/ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/ChangeLog,v
retrieving revision 1.452.2.38
diff -c -p -r1.452.2.38 ChangeLog
*** ChangeLog 2001/04/12 13:35:36 1.452.2.38
--- ChangeLog 2001/04/16 00:24:13
***************
*** 20,26 ****
2001-04-06 Joe Buck <jbuck@welsh-buck.org>
! * stl_algobase.h (std::equal): avoid use of possibly-undefined
operator != (one line patch).
2001-04-06 Gabriel Dos Reis <gdr@codesourcery.com>
--- 20,26 ----
2001-04-06 Joe Buck <jbuck@welsh-buck.org>
! * stl_algobase.h (std::equal): Avoid use of possibly-undefined
operator != (one line patch).
2001-04-06 Gabriel Dos Reis <gdr@codesourcery.com>
Index: libstdc++-v3/include/bits/stl_config.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/bits/Attic/stl_config.h,v
retrieving revision 1.3.6.1
diff -c -p -r1.3.6.1 stl_config.h
*** stl_config.h 2001/02/17 18:13:08 1.3.6.1
--- stl_config.h 2001/04/16 00:24:13
***************
*** 556,567 ****
# define __STL_VOLATILE
#endif
#if defined(__STL_CLASS_PARTIAL_SPECIALIZATION) \
&& defined(__STL_MEMBER_TEMPLATES) \
&& !defined(_STL_NO_CONCEPT_CHECKS)
# define __STL_USE_CONCEPT_CHECKS
#endif
!
#endif /* __STL_CONFIG_H */
--- 556,570 ----
# define __STL_VOLATILE
#endif
+ // Because concept-checks do not presently work correctly, they
+ // are disabled.
+ #if 0
#if defined(__STL_CLASS_PARTIAL_SPECIALIZATION) \
&& defined(__STL_MEMBER_TEMPLATES) \
&& !defined(_STL_NO_CONCEPT_CHECKS)
# define __STL_USE_CONCEPT_CHECKS
#endif
! #endif
#endif /* __STL_CONFIG_H */
Index: libstdc++-v3/src/locale-inst.cc
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/src/locale-inst.cc,v
retrieving revision 1.15
diff -c -p -r1.15 locale-inst.cc
*** locale-inst.cc 2001/02/08 20:33:19 1.15
--- locale-inst.cc 2001/04/16 00:24:13
*************** namespace std {
*** 285,292 ****
--- 285,296 ----
#endif
#endif // _GLIBCPP_USE_WCHAR_T
+ #ifdef __STL_USE_CONCEPT_CHECKS
+
template
void __sink_unused_warning<locale::facet*>(locale::facet*);
+
+ #endif // __STL_USE_CONCEPT_CHECKS
template
locale::facet**
Index: libstdc++-v3/src/misc-inst.cc
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/src/misc-inst.cc,v
retrieving revision 1.7
diff -c -p -r1.7 misc-inst.cc
*** misc-inst.cc 2001/02/07 01:54:21 1.7
--- misc-inst.cc 2001/04/16 00:24:13
*************** namespace std {
*** 240,245 ****
--- 240,247 ----
(vector<string>::const_iterator, vector<string>::const_iterator,
string*, _Bool<false>);
+ #ifdef __STL_USE_CONCEPT_CHECKS
+
template
void
__sink_unused_warning<char>(char);
*************** namespace std {
*** 259,264 ****
--- 261,268 ----
__sink_unused_warning<ostreambuf_iterator<wchar_t> >
(ostreambuf_iterator<wchar_t>);
#endif
+
+ #endif // __STL_USE_CONCEPT_CHECKS
template
void
Index: libstdc++-v3/src/stl-inst.cc
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/src/stl-inst.cc,v
retrieving revision 1.3
diff -c -p -r1.3 stl-inst.cc
*** stl-inst.cc 2000/07/22 01:27:10 1.3
--- stl-inst.cc 2001/04/16 00:24:13
***************
*** 1,6 ****
// Explicit instantiation file.
! // Copyright (C) 1999 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
--- 1,6 ----
// Explicit instantiation file.
! // Copyright (C) 1999, 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
*************** namespace std {
*** 49,56 ****
--- 49,60 ----
vector<unsigned int>::
_M_insert_aux(vector<unsigned int>::iterator, unsigned int const &);
+ #ifdef __STL_USE_CONCEPT_CHECKS
+
template
void
__sink_unused_warning<unsigned int>(unsigned int);
+
+ #endif // __STL_USE_CONCEPT_CHECKS
} //std