re PR libstdc++/3666 (Invalid concept-checking code.)

2001-11-01  Phil Edwards  <pme@gcc.gnu.org>

	* acinclude.m4:  Fix spacing.
	(GLIBCPP_ENABLE_CONCEPT_CHECKS):  New macro.
	* configure.in:  Call here.
	* acconfig.h:  Add _GLIBCPP_CONCEPT_CHECKS.
	* include/bits/boost_concept_check.h:  Fix headers.
	(__function_requires):  Make inline.
	* include/bits/c++config (_GLIBCPP_CONCEPT_CHECKS):  Remove.
	* aclocal.m4:  Regenerate.
	* config.h.in:  Regenerate.
	* configure:  Regenerate.

	Move trailing ';' inside macro, PR libstdc++/3666.
	* include/bits/concept_check.h:  Add semicolon.
	* include/bits/stl_algo.h:  Remove semicolon.
	* include/bits/stl_algobase.h:  Likewise.
	* include/bits/stl_deque.h:  Likewise.
	* include/bits/stl_heap.h:  Likewise.
	* include/bits/stl_iterator_base_funcs.h:  Likewise.
	* include/bits/stl_list.h:  Likewise.
	* include/bits/stl_map.h:  Likewise.
	* include/bits/stl_multimap.h:  Likewise.
	* include/bits/stl_multiset.h:  Likewise.
	* include/bits/stl_numeric.h:  Likewise.
	* include/bits/stl_queue.h:  Likewise.
	* include/bits/stl_set.h:  Likewise.
	* include/bits/stl_stack.h:  Likewise.
	* include/bits/stl_vector.h:  Likewise.
	* include/ext/hash_map:  Likewise.
	* include/ext/hash_set:  Likewise.
	* include/ext/slist:  Likewise.

	* src/concept-inst.cc:  New file with explicit instantiations.
	* src/Makefile.am (sources):  Add here, with special build rules.
	* src/Makefile.in:  Regenerate.

From-SVN: r46697

libstdc++-v3/ChangeLog

+2001-11-01  Phil Edwards  <pme@gcc.gnu.org>
+
+	* acinclude.m4:  Fix spacing.
+	(GLIBCPP_ENABLE_CONCEPT_CHECKS):  New macro.
+	* configure.in:  Call here.
+	* acconfig.h:  Add _GLIBCPP_CONCEPT_CHECKS.
+	* include/bits/boost_concept_check.h:  Fix headers.
+	(__function_requires):  Make inline.
+	* include/bits/c++config (_GLIBCPP_CONCEPT_CHECKS):  Remove.
+	* aclocal.m4:  Regenerate.
+	* config.h.in:  Regenerate.
+	* configure:  Regenerate.
+
+	Move trailing ';' inside macro, PR libstdc++/3666.
+	* include/bits/concept_check.h:  Add semicolon.
+	* include/bits/stl_algo.h:  Remove semicolon.
+	* include/bits/stl_algobase.h:  Likewise.
+	* include/bits/stl_deque.h:  Likewise.
+	* include/bits/stl_heap.h:  Likewise.
+	* include/bits/stl_iterator_base_funcs.h:  Likewise.
+	* include/bits/stl_list.h:  Likewise.
+	* include/bits/stl_map.h:  Likewise.
+	* include/bits/stl_multimap.h:  Likewise.
+	* include/bits/stl_multiset.h:  Likewise.
+	* include/bits/stl_numeric.h:  Likewise.
+	* include/bits/stl_queue.h:  Likewise.
+	* include/bits/stl_set.h:  Likewise.
+	* include/bits/stl_stack.h:  Likewise.
+	* include/bits/stl_vector.h:  Likewise.
+	* include/ext/hash_map:  Likewise.
+	* include/ext/hash_set:  Likewise.
+	* include/ext/slist:  Likewise.
+
+	* src/concept-inst.cc:  New file with explicit instantiations.
+	* src/Makefile.am (sources):  Add here, with special build rules.
+	* src/Makefile.in:  Regenerate.
+
 2001-11-01  Gabriel Dos Reis  <gdr@merlin.codesourcery.com>
 
 	* include/bits/std_complex.h (_Norm_helper): New class template.

libstdc++-v3/acconfig.h

@@ -34,6 +34,9 @@
 // Define if using setrlimit to limit memory usage during 'make check'.
 #undef _GLIBCPP_MEM_LIMITS
 
+// Define to use concept checking code from the boost libraries.
+#undef _GLIBCPP_CONCEPT_CHECKS
+
 // Define if you have the atan2f function.
 #undef _GLIBCPP_HAVE_ATAN2F 
 

libstdc++-v3/acinclude.m4

@@ -1355,7 +1355,7 @@ AC_DEFUN(GLIBCPP_ENABLE_C99, [dnl
 
   AC_ARG_ENABLE(c99,
   changequote(<<, >>)dnl
-  <<--enable-c99      turns on 'ISO/IEC 9899:1999 support' [default=>>GLIBCPP_ENABLE_C99_DEFAULT],
+  <<--enable-c99            turns on 'ISO/IEC 9899:1999 support' [default=>>GLIBCPP_ENABLE_C99_DEFAULT],
   changequote([, ])dnl
   [case "$enableval" in
    yes) enable_c99=yes ;;
@@ -1922,3 +1922,32 @@ AC_DEFUN(AC_LC_MESSAGES, [
   ])
 ])
 
+
+dnl
+dnl Check for whether the Boost-derived checks should be turned on.
+dnl
+dnl GLIBCPP_ENABLE_CONCEPT_CHECKS
+dnl --enable-concept-checks turns them on.
+dnl --disable-concept-checks leaves them off.
+dnl  +  Usage:  GLIBCPP_ENABLE_CONCEPT_CHECKS[(DEFAULT)]
+dnl       Where DEFAULT is either `yes' or `no'.  If ommitted, it
+dnl       defaults to `no'.
+AC_DEFUN(GLIBCPP_ENABLE_CONCEPT_CHECKS, [dnl
+define([GLIBCPP_ENABLE_CONCEPT_CHECKS_DEFAULT], ifelse($1, yes, yes, no))dnl
+AC_ARG_ENABLE(concept-checks,
+changequote(<<, >>)dnl
+<<  --enable-concept-checks use Boost-derived template checks [default=>>GLIBCPP_ENABLE_CONCEPT_CHECKS_DEFAULT],
+changequote([, ])dnl
+[case "$enableval" in
+ yes) enable_concept_checks=yes ;;
+ no)  enable_concept_checks=no ;;
+ *)   AC_MSG_ERROR([Unknown argument to enable/disable concept checks]) ;;
+ esac],
+enable_concept_checks=GLIBCPP_ENABLE_CONCEPT_CHECKS_DEFAULT)dnl
+dnl Option parsed, now set things appropriately
+if test x"$enable_concept_checks" = xyes; then
+  AC_DEFINE(_GLIBCPP_CONCEPT_CHECKS)
+fi
+])
+
+

libstdc++-v3/config.h.in

@@ -3,6 +3,9 @@
 /* Define if you have a working `mmap' system call.  */
 #undef HAVE_MMAP
 
+/* Define if you need to in order for stat and other things to work.  */
+#undef _POSIX_SOURCE
+
 // Define if GCC supports weak symbols
 #undef _GLIBCPP_SUPPORTS_WEAK
 
@@ -24,6 +27,9 @@
 // Define if using setrlimit to limit memory usage during 'make check'.
 #undef _GLIBCPP_MEM_LIMITS
 
+// Define to use concept checking code from the boost libraries.
+#undef _GLIBCPP_CONCEPT_CHECKS
+
 // Define if mbstate_t exists in wchar.h.
 #undef HAVE_MBSTATE_T
 
@@ -690,9 +696,6 @@
 /* Define if you have the <nan.h> header file.  */
 #undef HAVE_NAN_H
 
-/* Define if you have the <stdlib.h> header file.  */
-#undef HAVE_STDLIB_H
-
 /* Define if you have the <sys/isa_defs.h> header file.  */
 #undef HAVE_SYS_ISA_DEFS_H
 
@@ -702,9 +705,6 @@
 /* Define if you have the <sys/resource.h> header file.  */
 #undef HAVE_SYS_RESOURCE_H
 
-/* Define if you have the <sys/stat.h> header file.  */
-#undef HAVE_SYS_STAT_H
-
 /* Define if you have the <sys/types.h> header file.  */
 #undef HAVE_SYS_TYPES_H
 

libstdc++-v3/configure.in

@@ -48,6 +48,7 @@ GLIBCPP_ENABLE_CHEADERS([c_std])
 GLIBCPP_ENABLE_THREADS
 GLIBCPP_ENABLE_CXX_FLAGS([none])
 GLIBCPP_ENABLE_SJLJ_EXCEPTIONS
+GLIBCPP_ENABLE_CONCEPT_CHECKS
 
 
 if test -n "$with_cross_host" || test x"$build" != x"$host"; then

libstdc++-v3/include/bits/boost_concept_check.h

@@ -11,6 +11,7 @@
 #define _GLIBCPP_BOOST_CONCEPT_CHECK 1
 
 #pragma GCC system_header
+#include <bits/std_cstddef.h>                // for ptrdiff_t, used next
 #include <bits/stl_iterator_base_types.h>    // for traits and tags
 #include <utility>                           // for pair<>
 
@@ -20,8 +21,11 @@ namespace __gnu_cxx
 
 #define _IsUnused __attribute__ ((__unused__))
 
+// When the C-C code is in use, we would like this function to do as little
+// as possible at runtime, use as few resources as possible, and hopefully
+// be elided out of existence... hmmm.
 template <class _Concept>
-void __function_requires()
+inline void __function_requires()
 {
   void (_Concept::*__x)() _IsUnused = &_Concept::__constraints;
 }

libstdc++-v3/include/bits/c++config

@@ -55,9 +55,6 @@
 // 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
-
 // Define this to permit user-level control of the expansion of string
 // buffers (via a fn pointer), see basic_string.* for more.
 //#define _GLIBCPP_ALLOC_CONTROL

libstdc++-v3/include/bits/concept_check.h

@@ -66,15 +66,15 @@
 // a valid instantiation pattern.  Thus, we steal a feature from C99.
 
 #define __glibcpp_function_requires(...)                                 \
-            __gnu_cxx::__function_requires< __gnu_cxx::__VA_ARGS__ >()
+            __gnu_cxx::__function_requires< __gnu_cxx::__VA_ARGS__ >();
 #define __glibcpp_class_requires(_a,_C)                                  \
-            _GLIBCPP_CLASS_REQUIRES(_a, __gnu_cxx, _C)
+            _GLIBCPP_CLASS_REQUIRES(_a, __gnu_cxx, _C);
 #define __glibcpp_class_requires2(_a,_b,_C)                              \
-            _GLIBCPP_CLASS_REQUIRES2(_a, _b, __gnu_cxx, _C)
+            _GLIBCPP_CLASS_REQUIRES2(_a, _b, __gnu_cxx, _C);
 #define __glibcpp_class_requires3(_a,_b,_c,_C)                           \
-            _GLIBCPP_CLASS_REQUIRES3(_a, _b, _c, __gnu_cxx, _C)
+            _GLIBCPP_CLASS_REQUIRES3(_a, _b, _c, __gnu_cxx, _C);
 #define __glibcpp_class_requires4(_a,_b,_c,_d,_C)                        \
-            _GLIBCPP_CLASS_REQUIRES4(_a, _b, _c, _d, __gnu_cxx, _C)
+            _GLIBCPP_CLASS_REQUIRES4(_a, _b, _c, _d, __gnu_cxx, _C);
 
 #endif // enable/disable
 

libstdc++-v3/include/bits/stl_algobase.h

@@ -89,10 +89,10 @@ namespace std
       typedef typename iterator_traits<_ForwardIter2>::value_type _ValueType2;
 
       // concept requirements
-      __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIter1>);
-      __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIter2>);
-      __glibcpp_function_requires(_ConvertibleConcept<_ValueType1, _ValueType2>);
-      __glibcpp_function_requires(_ConvertibleConcept<_ValueType2, _ValueType1>);
+      __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIter1>)
+      __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIter2>)
+      __glibcpp_function_requires(_ConvertibleConcept<_ValueType1, _ValueType2>)
+      __glibcpp_function_requires(_ConvertibleConcept<_ValueType2, _ValueType1>)
 
       _ValueType1 __tmp = *__a;
       *__a = *__b;
@@ -104,7 +104,7 @@ namespace std
     swap(_Tp& __a, _Tp& __b)
     {
       // concept requirements
-      __glibcpp_function_requires(_SGIAssignableConcept<_Tp>);
+      __glibcpp_function_requires(_SGIAssignableConcept<_Tp>)
       
       _Tp __tmp = __a;
       __a = __b;
@@ -122,7 +122,7 @@ namespace std
     min(const _Tp& __a, const _Tp& __b)
     {
       // concept requirements
-      __glibcpp_function_requires(_LessThanComparableConcept<_Tp>);
+      __glibcpp_function_requires(_LessThanComparableConcept<_Tp>)
       //return __b < __a ? __b : __a;
       if (__b < __a) return __b; return __a;
     }
@@ -132,7 +132,7 @@ namespace std
     max(const _Tp& __a, const _Tp& __b) 
     {
       // concept requirements
-      __glibcpp_function_requires(_LessThanComparableConcept<_Tp>);
+      __glibcpp_function_requires(_LessThanComparableConcept<_Tp>)
       //return  __a < __b ? __b : __a;
       if (__a < __b) return __b; return __a;
     }
@@ -272,9 +272,9 @@ namespace std
     copy(_InputIter __first, _InputIter __last, _OutputIter __result)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIter>);
+      __glibcpp_function_requires(_InputIteratorConcept<_InputIter>)
       __glibcpp_function_requires(_OutputIteratorConcept<_OutputIter,
-	    typename iterator_traits<_InputIter>::value_type>);
+	    typename iterator_traits<_InputIter>::value_type>)
 
        typedef typename _Is_normal_iterator<_InputIter>::_Normal __Normal;
        return __copy_ni1(__first, __last, __result, __Normal());
@@ -396,11 +396,11 @@ namespace std
     copy_backward(_BI1 __first, _BI1 __last, _BI2 __result)
     {
       // concept requirements
-      __glibcpp_function_requires(_BidirectionalIteratorConcept<_BI1>);
-      __glibcpp_function_requires(_Mutable_BidirectionalIteratorConcept<_BI2>);
+      __glibcpp_function_requires(_BidirectionalIteratorConcept<_BI1>)
+      __glibcpp_function_requires(_Mutable_BidirectionalIteratorConcept<_BI2>)
       __glibcpp_function_requires(_ConvertibleConcept<
 	    typename iterator_traits<_BI1>::value_type,
-	    typename iterator_traits<_BI2>::value_type>);
+	    typename iterator_traits<_BI2>::value_type>)
 
       typedef typename _Is_normal_iterator<_BI1>::_Normal __Normal;
       return __copy_backward_input_normal_iterator(__first, __last, __result,
@@ -439,9 +439,9 @@ namespace std
     copy_n(_InputIter __first, _Size __count, _OutputIter __result)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIter>);
+      __glibcpp_function_requires(_InputIteratorConcept<_InputIter>)
       __glibcpp_function_requires(_OutputIteratorConcept<_OutputIter,
-	    typename iterator_traits<_InputIter>::value_type>);
+	    typename iterator_traits<_InputIter>::value_type>)
 
       return __copy_n(__first, __count, __result, __iterator_category(__first));
     }
@@ -455,7 +455,7 @@ namespace std
     fill(_ForwardIter __first, _ForwardIter __last, const _Tp& __value)
     {
       // concept requirements
-      __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIter>);
+      __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIter>)
 
       for ( ; __first != __last; ++__first)
 	*__first = __value;
@@ -466,7 +466,7 @@ namespace std
     fill_n(_OutputIter __first, _Size __n, const _Tp& __value)
     {
       // concept requirements
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIter,_Tp>);
+      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIter,_Tp>)
 
       for ( ; __n > 0; --__n, ++__first)
 	*__first = __value;
@@ -530,12 +530,12 @@ namespace std
 	     _InputIter2 __first2)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIter1>);
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIter2>);
+      __glibcpp_function_requires(_InputIteratorConcept<_InputIter1>)
+      __glibcpp_function_requires(_InputIteratorConcept<_InputIter2>)
       __glibcpp_function_requires(_EqualityComparableConcept<
-	    typename iterator_traits<_InputIter1>::value_type>);
+	    typename iterator_traits<_InputIter1>::value_type>)
       __glibcpp_function_requires(_EqualityComparableConcept<
-	    typename iterator_traits<_InputIter2>::value_type>);
+	    typename iterator_traits<_InputIter2>::value_type>)
 
       while (__first1 != __last1 && *__first1 == *__first2) {
 	++__first1;
@@ -551,8 +551,8 @@ namespace std
 	     _BinaryPredicate __binary_pred)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIter1>);
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIter2>);
+      __glibcpp_function_requires(_InputIteratorConcept<_InputIter1>)
+      __glibcpp_function_requires(_InputIteratorConcept<_InputIter2>)
 
       while (__first1 != __last1 && __binary_pred(*__first1, *__first2)) {
 	++__first1;
@@ -567,11 +567,11 @@ namespace std
 	  _InputIter2 __first2)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIter1>);
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIter2>);
+      __glibcpp_function_requires(_InputIteratorConcept<_InputIter1>)
+      __glibcpp_function_requires(_InputIteratorConcept<_InputIter2>)
       __glibcpp_function_requires(_EqualOpConcept<
 	    typename iterator_traits<_InputIter1>::value_type,
-	    typename iterator_traits<_InputIter2>::value_type>);
+	    typename iterator_traits<_InputIter2>::value_type>)
 
       for ( ; __first1 != __last1; ++__first1, ++__first2)
 	if (!(*__first1 == *__first2))
@@ -586,8 +586,8 @@ namespace std
 	  _BinaryPredicate __binary_pred)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIter1>);
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIter2>);
+      __glibcpp_function_requires(_InputIteratorConcept<_InputIter1>)
+      __glibcpp_function_requires(_InputIteratorConcept<_InputIter2>)
 
       for ( ; __first1 != __last1; ++__first1, ++__first2)
 	if (!__binary_pred(*__first1, *__first2))
@@ -605,12 +605,12 @@ namespace std
 			    _InputIter2 __first2, _InputIter2 __last2)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIter1>);
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIter2>);
+      __glibcpp_function_requires(_InputIteratorConcept<_InputIter1>)
+      __glibcpp_function_requires(_InputIteratorConcept<_InputIter2>)
       __glibcpp_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_InputIter1>::value_type>);
+	    typename iterator_traits<_InputIter1>::value_type>)
       __glibcpp_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_InputIter2>::value_type>);
+	    typename iterator_traits<_InputIter2>::value_type>)
 
       for ( ; __first1 != __last1 && __first2 != __last2
 	    ; ++__first1, ++__first2) {
@@ -629,8 +629,8 @@ namespace std
 			    _Compare __comp)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIter1>);
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIter2>);
+      __glibcpp_function_requires(_InputIteratorConcept<_InputIter1>)
+      __glibcpp_function_requires(_InputIteratorConcept<_InputIter2>)
 
       for ( ; __first1 != __last1 && __first2 != __last2
 	    ; ++__first1, ++__first2) {
@@ -727,12 +727,12 @@ namespace std
 				 _InputIter2 __first2, _InputIter2 __last2)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIter1>);
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIter2>);
+      __glibcpp_function_requires(_InputIteratorConcept<_InputIter1>)
+      __glibcpp_function_requires(_InputIteratorConcept<_InputIter2>)
       __glibcpp_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_InputIter1>::value_type>);
+	    typename iterator_traits<_InputIter1>::value_type>)
       __glibcpp_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_InputIter2>::value_type>);
+	    typename iterator_traits<_InputIter2>::value_type>)
 
       return __lexicographical_compare_3way(__first1, __last1, __first2, __last2);
     }

libstdc++-v3/include/bits/stl_deque.h

@@ -394,7 +394,7 @@ template <class _Tp, class _Alloc = allocator<_Tp> >
 class deque : protected _Deque_base<_Tp, _Alloc> {
 
   // concept requirements
-  __glibcpp_class_requires(_Tp, _SGIAssignableConcept);
+  __glibcpp_class_requires(_Tp, _SGIAssignableConcept)
 
   typedef _Deque_base<_Tp, _Alloc> _Base;
 public:                         // Basic types

libstdc++-v3/include/bits/stl_heap.h

@@ -89,8 +89,8 @@ namespace std
 
       // concept requirements
       __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>);
-      __glibcpp_function_requires(_LessThanComparableConcept<_ValueType>);
+	    _RandomAccessIterator>)
+      __glibcpp_function_requires(_LessThanComparableConcept<_ValueType>)
 
       __push_heap(__first, _DistanceType((__last - __first) - 1), _DistanceType(0), 
 		  _ValueType(*(__last - 1)));
@@ -123,7 +123,7 @@ namespace std
 
       // concept requirements
       __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>);
+	    _RandomAccessIterator>)
 
       __push_heap(__first, _DistanceType((__last - __first) - 1), _DistanceType(0), 
 		  _ValueType(*(__last - 1)), __comp);
@@ -168,8 +168,8 @@ namespace std
 
       // concept requirements
       __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>);
-      __glibcpp_function_requires(_LessThanComparableConcept<_ValueType>);
+	    _RandomAccessIterator>)
+      __glibcpp_function_requires(_LessThanComparableConcept<_ValueType>)
 
       __pop_heap(__first, __last - 1, __last - 1, _ValueType(*(__last - 1)));
     }
@@ -214,7 +214,7 @@ namespace std
     {
       // concept requirements
       __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>);
+	    _RandomAccessIterator>)
 
       typedef typename iterator_traits<_RandomAccessIterator>::value_type _ValueType;
       __pop_heap(__first, __last - 1, __last - 1, _ValueType(*(__last - 1)), __comp);
@@ -231,8 +231,8 @@ namespace std
 
       // concept requirements
       __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>);
-      __glibcpp_function_requires(_LessThanComparableConcept<_ValueType>);
+	    _RandomAccessIterator>)
+      __glibcpp_function_requires(_LessThanComparableConcept<_ValueType>)
 
       if (__last - __first < 2) return;
       _DistanceType __len = __last - __first;
@@ -257,7 +257,7 @@ namespace std
 
       // concept requirements
       __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>);
+	    _RandomAccessIterator>)
 
       if (__last - __first < 2) return;
       _DistanceType __len = __last - __first;
@@ -277,9 +277,9 @@ namespace std
     {
       // concept requirements
       __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>);
+	    _RandomAccessIterator>)
       __glibcpp_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_RandomAccessIterator>::value_type>);
+	    typename iterator_traits<_RandomAccessIterator>::value_type>)
 
       while (__last - __first > 1)
 	pop_heap(__first, __last--);
@@ -292,7 +292,7 @@ namespace std
     {
       // concept requirements
       __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>);
+	    _RandomAccessIterator>)
 
       while (__last - __first > 1)
 	pop_heap(__first, __last--, __comp);

libstdc++-v3/include/bits/stl_iterator_base_funcs.h

@@ -81,7 +81,7 @@ namespace std
 	       _Distance& __n, input_iterator_tag)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>);
+      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
       while (__first != __last) { ++__first; ++__n; }
     }
 
@@ -91,7 +91,7 @@ namespace std
 	       _Distance& __n, random_access_iterator_tag)
     {
       // concept requirements
-      __glibcpp_function_requires(_RandomAccessIteratorConcept<_RandomAccessIterator>);
+      __glibcpp_function_requires(_RandomAccessIteratorConcept<_RandomAccessIterator>)
       __n += __last - __first;
     }
 
@@ -109,7 +109,7 @@ namespace std
     __distance(_InputIterator __first, _InputIterator __last, input_iterator_tag)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>);
+      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
       typename iterator_traits<_InputIterator>::difference_type __n = 0;
       while (__first != __last) {
 	++__first; ++__n;
@@ -123,7 +123,7 @@ namespace std
 			   random_access_iterator_tag)
     {
       // concept requirements
-      __glibcpp_function_requires(_RandomAccessIteratorConcept<_RandomAccessIterator>);
+      __glibcpp_function_requires(_RandomAccessIteratorConcept<_RandomAccessIterator>)
       return __last - __first;
     }
 
@@ -140,7 +140,7 @@ namespace std
     __advance(_InputIter& __i, _Distance __n, input_iterator_tag)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIter>);
+      __glibcpp_function_requires(_InputIteratorConcept<_InputIter>)
       while (__n--) ++__i;
     }
 
@@ -149,7 +149,7 @@ namespace std
     __advance(_BidirectionalIterator& __i, _Distance __n, bidirectional_iterator_tag)
     {
       // concept requirements
-      __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator>);
+      __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator>)
       if (__n > 0)
 	while (__n--) ++__i;
       else
@@ -161,7 +161,7 @@ namespace std
     __advance(_RandomAccessIterator& __i, _Distance __n, random_access_iterator_tag)
     {
       // concept requirements
-      __glibcpp_function_requires(_RandomAccessIteratorConcept<_RandomAccessIterator>);
+      __glibcpp_function_requires(_RandomAccessIteratorConcept<_RandomAccessIterator>)
       __i += __n;
     }
 

libstdc++-v3/include/bits/stl_list.h

@@ -230,7 +230,7 @@ template <class _Tp, class _Alloc = allocator<_Tp> >
 class list : protected _List_base<_Tp, _Alloc>
 {
   // concept requirements
-  __glibcpp_class_requires(_Tp, _SGIAssignableConcept);
+  __glibcpp_class_requires(_Tp, _SGIAssignableConcept)
 
   typedef _List_base<_Tp, _Alloc> _Base;
 protected:

libstdc++-v3/include/bits/stl_map.h

@@ -70,7 +70,7 @@ template <class _Key, class _Tp, class _Compare = less<_Key>,
 class map
 {
   // concept requirements
-  __glibcpp_class_requires(_Tp, _SGIAssignableConcept);
+  __glibcpp_class_requires(_Tp, _SGIAssignableConcept)
   __glibcpp_class_requires4(_Compare, bool, _Key, _Key, _BinaryFunctionConcept);
 
 public:

libstdc++-v3/include/bits/stl_multimap.h

@@ -84,7 +84,7 @@ template <class _Key, class _Tp, class _Compare, class _Alloc>
 class multimap
 {
   // concept requirements
-  __glibcpp_class_requires(_Tp, _SGIAssignableConcept);
+  __glibcpp_class_requires(_Tp, _SGIAssignableConcept)
   __glibcpp_class_requires4(_Compare, bool, _Key, _Key, _BinaryFunctionConcept);
 
 public:

libstdc++-v3/include/bits/stl_multiset.h

@@ -83,7 +83,7 @@ template <class _Key, class _Compare, class _Alloc>
 class multiset
 {
   // concept requirements
-  __glibcpp_class_requires(_Key, _SGIAssignableConcept);
+  __glibcpp_class_requires(_Key, _SGIAssignableConcept)
   __glibcpp_class_requires4(_Compare, bool, _Key, _Key, _BinaryFunctionConcept);
 
 public:

libstdc++-v3/include/bits/stl_numeric.h

@@ -69,7 +69,7 @@ namespace std
     accumulate(_InputIterator __first, _InputIterator __last, _Tp __init)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>);
+      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
 
       for ( ; __first != __last; ++__first)
 	__init = __init + *__first;
@@ -82,7 +82,7 @@ namespace std
 	       _BinaryOperation __binary_op)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>);
+      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
 
       for ( ; __first != __last; ++__first)
 	__init = __binary_op(__init, *__first);
@@ -95,8 +95,8 @@ namespace std
 		  _InputIterator2 __first2, _Tp __init)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>);
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>);
+      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>)
+      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>)
 
       for ( ; __first1 != __last1; ++__first1, ++__first2)
 	__init = __init + (*__first1 * *__first2);
@@ -112,8 +112,8 @@ namespace std
 		  _BinaryOperation2 __binary_op2)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>);
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>);
+      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>)
+      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>)
 
       for ( ; __first1 != __last1; ++__first1, ++__first2)
 	__init = __binary_op1(__init, __binary_op2(*__first1, *__first2));
@@ -128,8 +128,8 @@ namespace std
       typedef typename iterator_traits<_InputIterator>::value_type _ValueType;
 
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>);
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, _ValueType>);
+      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, _ValueType>)
 
       if (__first == __last) return __result;
       *__result = *__first;
@@ -149,8 +149,8 @@ namespace std
       typedef typename iterator_traits<_InputIterator>::value_type _ValueType;
 
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>);
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, _ValueType>);
+      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, _ValueType>)
 
       if (__first == __last) return __result;
       *__result = *__first;
@@ -170,8 +170,8 @@ namespace std
       typedef typename iterator_traits<_InputIterator>::value_type _ValueType;
 
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>);
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, _ValueType>);
+      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, _ValueType>)
 
       if (__first == __last) return __result;
       *__result = *__first;
@@ -192,8 +192,8 @@ namespace std
       typedef typename iterator_traits<_InputIterator>::value_type _ValueType;
 
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>);
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, _ValueType>);
+      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, _ValueType>)
 
       if (__first == __last) return __result;
       *__result = *__first;
@@ -259,9 +259,9 @@ namespace std
     iota(_ForwardIter __first, _ForwardIter __last, _Tp __value)
     {
       // concept requirements
-      __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIter>);
+      __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIter>)
       __glibcpp_function_requires(_ConvertibleConcept<_Tp,
-	    typename iterator_traits<_ForwardIter>::value_type>);
+	    typename iterator_traits<_ForwardIter>::value_type>)
 
       while (__first != __last)
 	*__first++ = __value++;

libstdc++-v3/include/bits/stl_queue.h

@@ -82,9 +82,9 @@ template <class _Tp, class _Sequence>
 class queue
 {
   // concept requirements
-  __glibcpp_class_requires(_Tp, _SGIAssignableConcept);
-  __glibcpp_class_requires(_Sequence, _FrontInsertionSequenceConcept);
-  __glibcpp_class_requires(_Sequence, _BackInsertionSequenceConcept);
+  __glibcpp_class_requires(_Tp, _SGIAssignableConcept)
+  __glibcpp_class_requires(_Sequence, _FrontInsertionSequenceConcept)
+  __glibcpp_class_requires(_Sequence, _BackInsertionSequenceConcept)
   typedef typename _Sequence::value_type _Sequence_value_type;
   __glibcpp_class_requires2(_Tp, _Sequence_value_type, _SameTypeConcept);
 
@@ -164,9 +164,9 @@ template <class _Tp,
 class priority_queue
 {
   // concept requirements
-  __glibcpp_class_requires(_Tp, _SGIAssignableConcept);
-  __glibcpp_class_requires(_Sequence, _SequenceConcept);
-  __glibcpp_class_requires(_Sequence, _RandomAccessContainerConcept);
+  __glibcpp_class_requires(_Tp, _SGIAssignableConcept)
+  __glibcpp_class_requires(_Sequence, _SequenceConcept)
+  __glibcpp_class_requires(_Sequence, _RandomAccessContainerConcept)
   typedef typename _Sequence::value_type _Sequence_value_type;
   __glibcpp_class_requires2(_Tp, _Sequence_value_type, _SameTypeConcept);
   __glibcpp_class_requires4(_Compare, bool, _Tp, _Tp, _BinaryFunctionConcept);

libstdc++-v3/include/bits/stl_set.h

@@ -84,7 +84,7 @@ template <class _Key, class _Compare, class _Alloc>
 class set
 {
   // concept requirements
-  __glibcpp_class_requires(_Key, _SGIAssignableConcept);
+  __glibcpp_class_requires(_Key, _SGIAssignableConcept)
   __glibcpp_class_requires4(_Compare, bool, _Key, _Key, _BinaryFunctionConcept);
 
 public:

libstdc++-v3/include/bits/stl_stack.h

@@ -82,8 +82,8 @@ template <class _Tp, class _Sequence>
 class stack
 {
   // concept requirements
-  __glibcpp_class_requires(_Tp, _SGIAssignableConcept);
-  __glibcpp_class_requires(_Sequence, _BackInsertionSequenceConcept);
+  __glibcpp_class_requires(_Tp, _SGIAssignableConcept)
+  __glibcpp_class_requires(_Sequence, _BackInsertionSequenceConcept)
   typedef typename _Sequence::value_type _Sequence_value_type;
   __glibcpp_class_requires2(_Tp, _Sequence_value_type, _SameTypeConcept);
 

libstdc++-v3/include/bits/stl_vector.h

@@ -147,7 +147,7 @@ template <class _Tp, class _Alloc = allocator<_Tp> >
 class vector : protected _Vector_base<_Tp, _Alloc> 
 {
   // concept requirements
-  __glibcpp_class_requires(_Tp, _SGIAssignableConcept);
+  __glibcpp_class_requires(_Tp, _SGIAssignableConcept)
 
 private:
   typedef _Vector_base<_Tp, _Alloc> _Base;

libstdc++-v3/include/ext/hash_map

@@ -233,8 +233,8 @@ template <class _Key, class _Tp, class _HashFcn, class _EqualKey, class _Alloc>
 class hash_multimap
 {
   // concept requirements
-  __glibcpp_class_requires(_Key, _SGIAssignableConcept);
-  __glibcpp_class_requires(_Tp, _SGIAssignableConcept);
+  __glibcpp_class_requires(_Key, _SGIAssignableConcept)
+  __glibcpp_class_requires(_Tp, _SGIAssignableConcept)
   __glibcpp_class_requires3(_HashFcn, size_t, _Key, _UnaryFunctionConcept);
   __glibcpp_class_requires3(_EqualKey, _Key, _Key, _BinaryPredicateConcept);
 

libstdc++-v3/include/ext/hash_set

@@ -83,7 +83,7 @@ template <class _Value, class _HashFcn, class _EqualKey, class _Alloc>
 class hash_set
 {
   // concept requirements
-  __glibcpp_class_requires(_Value, _SGIAssignableConcept);
+  __glibcpp_class_requires(_Value, _SGIAssignableConcept)
   __glibcpp_class_requires3(_HashFcn, size_t, _Value, _UnaryFunctionConcept);
   __glibcpp_class_requires3(_EqualKey, _Value, _Value, _BinaryPredicateConcept);
 
@@ -234,7 +234,7 @@ template <class _Value, class _HashFcn, class _EqualKey, class _Alloc>
 class hash_multiset
 {
   // concept requirements
-  __glibcpp_class_requires(_Value, _SGIAssignableConcept);
+  __glibcpp_class_requires(_Value, _SGIAssignableConcept)
   __glibcpp_class_requires3(_HashFcn, size_t, _Value, _UnaryFunctionConcept);
   __glibcpp_class_requires3(_EqualKey, _Value, _Value, _BinaryPredicateConcept);
 

libstdc++-v3/include/ext/slist

@@ -291,7 +291,7 @@ template <class _Tp, class _Alloc = allocator<_Tp> >
 class slist : private _Slist_base<_Tp,_Alloc>
 {
   // concept requirements
-  __glibcpp_class_requires(_Tp, _SGIAssignableConcept);
+  __glibcpp_class_requires(_Tp, _SGIAssignableConcept)
 
 private:
   typedef _Slist_base<_Tp,_Alloc> _Base;

libstdc++-v3/src/Makefile.am

@@ -65,7 +65,7 @@ sources = \
 	locale.cc locale-inst.cc localename.cc \
 	collate.cc messages.cc moneypunct.cc numpunct.cc time.cc \
 	misc-inst.cc stdexcept.cc stl-inst.cc string-inst.cc strstream.cc \
-	valarray-inst.cc wstring-inst.cc
+	valarray-inst.cc wstring-inst.cc concept-inst.cc
 
 VPATH = $(top_srcdir):$(top_srcdir)/src
 
@@ -88,16 +88,20 @@ strstream.lo: strstream.cc
 strstream.o: strstream.cc
 	$(CXXCOMPILE) -I$(GLIBCPP_INCLUDE_DIR)/backward -c $<
 
+# Use special rules for the concept-checking instantiations so that all
+# the generated template functions are also instantiated.  Force the checks
+# to be on so that the instantiations are actually seen.
+concept-inst.lo: concept-inst.cc
+	$(LTCXXCOMPILE) -D_GLIBCPP_CONCEPT_CHECKS -fimplicit-templates -c $<
+concept-inst.o: concept-inst.cc
+	$(CXXCOMPILE) -D_GLIBCPP_CONCEPT_CHECKS -fimplicit-templates -c $<
+
 
 # AM_CXXFLAGS needs to be in each subdirectory so that it can be
 # modified in a per-library or per-sub-library way.  Need to manually
 # set this option because CONFIG_CXXFLAGS has to be after
 # OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden
 # as the occasion call for it. (ie, --enable-debug)
-#
-# 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 \
 	$(LIBSUPCXX_CXXFLAGS) \

libstdc++-v3/src/Makefile.in

-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -66,7 +66,6 @@ AR = @AR@
 AS = @AS@
 ATOMICITY_INC_SRCDIR = @ATOMICITY_INC_SRCDIR@
 BASIC_FILE_H = @BASIC_FILE_H@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -88,16 +87,16 @@ EXTRA_CXX_FLAGS = @EXTRA_CXX_FLAGS@
 GCJ = @GCJ@
 GCJFLAGS = @GCJFLAGS@
 GENCAT = @GENCAT@
-GLIBC21 = @GLIBC21@
 GLIBCPP_IS_CROSS_COMPILING = @GLIBCPP_IS_CROSS_COMPILING@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+GT_NO = @GT_NO@
+GT_YES = @GT_YES@
+INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
+INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-LIBICONV = @LIBICONV@
 LIBMATHOBJS = @LIBMATHOBJS@
 LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@
 LIBTOOL = @LIBTOOL@
@@ -138,6 +137,7 @@ glibcpp_toolexecdir = @glibcpp_toolexecdir@
 glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@
 gxx_include_dir = @gxx_include_dir@
 ifGNUmake = @ifGNUmake@
+l = @l@
 libio_la = @libio_la@
 libtool_VERSION = @libtool_VERSION@
 release_VERSION = @release_VERSION@
@@ -190,7 +190,7 @@ sources = \
 	locale.cc locale-inst.cc localename.cc \
 	collate.cc messages.cc moneypunct.cc numpunct.cc time.cc \
 	misc-inst.cc stdexcept.cc stl-inst.cc string-inst.cc strstream.cc \
-	valarray-inst.cc wstring-inst.cc
+	valarray-inst.cc wstring-inst.cc concept-inst.cc
 
 
 VPATH = $(top_srcdir):$(top_srcdir)/src
@@ -215,10 +215,6 @@ GLIBCPP_INCLUDE_DIR = @glibcpp_builddir@/include
 # set this option because CONFIG_CXXFLAGS has to be after
 # OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden
 # as the occasion call for it. (ie, --enable-debug)
-#
-# 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 \
 	$(LIBSUPCXX_CXXFLAGS) \
@@ -271,7 +267,8 @@ libstdc___la_OBJECTS =  basic_file.lo bitset.lo c++locale.lo cmath.lo \
 codecvt.lo complex_io.lo functexcept.lo globals.lo ios.lo limits.lo \
 locale.lo locale-inst.lo localename.lo collate.lo messages.lo \
 moneypunct.lo numpunct.lo time.lo misc-inst.lo stdexcept.lo stl-inst.lo \
-string-inst.lo strstream.lo valarray-inst.lo wstring-inst.lo
+string-inst.lo strstream.lo valarray-inst.lo wstring-inst.lo \
+concept-inst.lo
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
@@ -502,6 +499,14 @@ strstream.lo: strstream.cc
 strstream.o: strstream.cc
 	$(CXXCOMPILE) -I$(GLIBCPP_INCLUDE_DIR)/backward -c $<
 
+# Use special rules for the concept-checking instantiations so that all
+# the generated template functions are also instantiated.  Force the checks
+# to be on so that the instantiations are actually seen.
+concept-inst.lo: concept-inst.cc
+	$(LTCXXCOMPILE) -D_GLIBCPP_CONCEPT_CHECKS -fimplicit-templates -c $<
+concept-inst.o: concept-inst.cc
+	$(CXXCOMPILE) -D_GLIBCPP_CONCEPT_CHECKS -fimplicit-templates -c $<
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

libstdc++-v3/src/concept-inst.cc

+// Concept checking instantiations -*- C++ -*-
+
+// Copyright (C) 2001 Free Software Foundation
+//
+// This file is part of GNU CC.
+//
+// GNU CC 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.
+// 
+// GNU CC 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 GNU CC; see the file COPYING.  If not, write to
+// the Free Software Foundation, 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+// As a special exception, you may use this file as part of a free software
+// library without restriction.  Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License.  This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+
+// The implementation of some of the more complex checks uses the simple
+// checks (good reuse of code), thereby requiring that the simple checks
+// be instantiated somewhere.  The simple checks use other simple checks,
+// and so on, until a couple hundred symbols all need instantiations.  We
+// explicitly instantiate the initial set of symbols; compiling this file
+// with -fimplicit-templates will take care of the rest for us.
+
+#include <bits/concept_check.h>
+
+#ifdef _GLIBCPP_CONCEPT_CHECKS
+
+#include <bits/stl_alloc.h>
+#include <bits/std_vector.h>
+#include <bits/std_ostream.h>
+
+#define _Instantiate(...) template void __function_requires< __VA_ARGS__ > ()
+
+namespace __gnu_cxx
+{
+
+  template void __aux_require_boolean_expr<bool>(bool const&);
+
+  _Instantiate(_BidirectionalIteratorConcept<
+    std::__normal_iterator< std::locale::facet**,
+    std::vector<std::locale::facet*,std::allocator<std::locale::facet*> > > > );
+
+  _Instantiate(_BidirectionalIteratorConcept<
+    std::__normal_iterator< unsigned*,
+    std::vector<unsigned, std::allocator<unsigned> > > > );
+
+  _Instantiate(_ConvertibleConcept<std::locale::facet*, std::locale::facet*> );
+
+  _Instantiate(_ConvertibleConcept<unsigned, unsigned> );
+
+  _Instantiate(_InputIteratorConcept<char*> );
+
+  _Instantiate(_InputIteratorConcept<char const*> );
+
+  _Instantiate(_InputIteratorConcept<std::locale::facet**> );
+
+  _Instantiate(_InputIteratorConcept<
+    std::__normal_iterator< std::locale::facet* const*,
+    std::vector<std::locale::facet*,std::allocator<std::locale::facet*> > > > );
+
+  _Instantiate(_InputIteratorConcept<
+    std::__normal_iterator< std::locale::facet**,
+    std::vector<std::locale::facet*,std::allocator<std::locale::facet*> > > > );
+
+  _Instantiate(_InputIteratorConcept<
+    std::__normal_iterator< unsigned*,
+    std::vector<unsigned, std::allocator<unsigned> > > > );
+
+#ifdef _GLIBCPP_USE_WCHAR_T
+  _Instantiate(_InputIteratorConcept<wchar_t*> );
+
+  _Instantiate(_InputIteratorConcept<wchar_t const*> );
+
+  _Instantiate(_LessThanComparableConcept<wchar_t*> );
+#endif
+
+  _Instantiate(_LessThanComparableConcept<char*> );
+
+  _Instantiate(_LessThanComparableConcept<int> );
+
+  _Instantiate(_LessThanComparableConcept<long> );
+
+#ifdef _GLIBCPP_USE_LONG_LONG
+  _Instantiate(_LessThanComparableConcept<long long> );
+#endif
+
+  _Instantiate(_LessThanComparableConcept<unsigned> );
+
+  _Instantiate(_Mutable_BidirectionalIteratorConcept<
+    std::__normal_iterator< std::locale::facet**,
+    std::vector<std::locale::facet*,std::allocator<std::locale::facet*> > > > );
+
+  _Instantiate(_Mutable_BidirectionalIteratorConcept<
+    std::__normal_iterator< unsigned*,
+    std::vector<unsigned, std::allocator<unsigned> > > > );
+
+  _Instantiate(_Mutable_ForwardIteratorConcept<
+    std::__normal_iterator< std::locale::facet**,
+    std::vector<std::locale::facet*,std::allocator<std::locale::facet*> > > > );
+
+  _Instantiate(_OutputIteratorConcept<
+    std::locale::facet**, std::locale::facet*> );
+
+  _Instantiate(_OutputIteratorConcept<
+    std::__normal_iterator< std::locale::facet**,
+      std::vector<std::locale::facet*, std::allocator<std::locale::facet* > > >,
+    std::locale::facet* > );
+
+  _Instantiate(_OutputIteratorConcept<std::__normal_iterator<
+    unsigned*, std::vector<unsigned, std::allocator<unsigned> > >, unsigned> );
+
+  _Instantiate(_OutputIteratorConcept<std::ostreambuf_iterator<
+    char, std::char_traits<char> >, char> );
+
+#ifdef _GLIBCPP_USE_WCHAR_T
+  _Instantiate(_OutputIteratorConcept<std::ostreambuf_iterator<
+    wchar_t, std::char_traits<wchar_t> >, wchar_t> );
+#endif
+
+  _Instantiate(_RandomAccessIteratorConcept<char*> );
+
+  _Instantiate(_RandomAccessIteratorConcept<char const*> );
+
+  _Instantiate(_RandomAccessIteratorConcept<
+    std::__normal_iterator<char const*, std::string> > );
+
+  _Instantiate(_RandomAccessIteratorConcept<
+    std::__normal_iterator<char*, std::string> > );
+
+#ifdef _GLIBCPP_USE_WCHAR_T
+  _Instantiate(_RandomAccessIteratorConcept<
+    std::__normal_iterator<wchar_t const*,
+    std::basic_string<wchar_t, std::char_traits<wchar_t>,
+                               std::allocator<wchar_t> > > > );
+
+  _Instantiate(_RandomAccessIteratorConcept<
+    std::__normal_iterator<wchar_t*,
+    std::basic_string<wchar_t, std::char_traits<wchar_t>,
+                               std::allocator<wchar_t> > > > );
+
+  _Instantiate(_RandomAccessIteratorConcept<wchar_t*> );
+
+  _Instantiate(_RandomAccessIteratorConcept<wchar_t const*> );
+#endif
+
+} // namespace __gnu_cxx
+
+#undef _Instantiate
+
+#endif
+
+