diff options
author | pme <pme@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-11-01 15:46:48 +0000 |
---|---|---|
committer | pme <pme@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-11-01 15:46:48 +0000 |
commit | 3c51fd26ce1077f28bbce3b207b7373c34c4bfd9 (patch) | |
tree | aa55ff5e180aa3c1a2053c66b0ce396ae67ab5d5 /libstdc++-v3/include/bits | |
parent | b8d112177d971ed72d988de9b0d09459aaf7f96f (diff) | |
download | gcc-3c51fd26ce1077f28bbce3b207b7373c34c4bfd9.tar.gz |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46697 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/bits')
-rw-r--r-- | libstdc++-v3/include/bits/boost_concept_check.h | 6 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/c++config | 3 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/concept_check.h | 10 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/stl_algo.h | 506 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/stl_algobase.h | 74 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/stl_deque.h | 2 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/stl_heap.h | 24 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/stl_iterator_base_funcs.h | 14 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/stl_list.h | 2 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/stl_map.h | 2 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/stl_multimap.h | 2 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/stl_multiset.h | 2 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/stl_numeric.h | 32 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/stl_queue.h | 12 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/stl_set.h | 2 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/stl_stack.h | 4 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/stl_vector.h | 2 |
17 files changed, 350 insertions, 349 deletions
diff --git a/libstdc++-v3/include/bits/boost_concept_check.h b/libstdc++-v3/include/bits/boost_concept_check.h index 18d580b7ee1..91d7019155e 100644 --- a/libstdc++-v3/include/bits/boost_concept_check.h +++ b/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; } diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config index d5698eae3d3..33104ba35e9 100644 --- a/libstdc++-v3/include/bits/c++config +++ b/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 diff --git a/libstdc++-v3/include/bits/concept_check.h b/libstdc++-v3/include/bits/concept_check.h index 2a02bd8c8b3..4ee8d9b6cc8 100644 --- a/libstdc++-v3/include/bits/concept_check.h +++ b/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 diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h index 61a2d2e29ab..3053515c52f 100644 --- a/libstdc++-v3/include/bits/stl_algo.h +++ b/libstdc++-v3/include/bits/stl_algo.h @@ -74,7 +74,7 @@ namespace std __median(const _Tp& __a, const _Tp& __b, const _Tp& __c) { // concept requirements - __glibcpp_function_requires(_LessThanComparableConcept<_Tp>); + __glibcpp_function_requires(_LessThanComparableConcept<_Tp>) if (__a < __b) if (__b < __c) return __b; @@ -95,7 +95,7 @@ namespace std __median(const _Tp& __a, const _Tp& __b, const _Tp& __c, _Compare __comp) { // concept requirements - __glibcpp_function_requires(_BinaryFunctionConcept<_Compare, bool, _Tp, _Tp>); + __glibcpp_function_requires(_BinaryFunctionConcept<_Compare, bool, _Tp, _Tp>) if (__comp(__a, __b)) if (__comp(__b, __c)) return __b; @@ -117,7 +117,7 @@ namespace std for_each(_InputIter __first, _InputIter __last, _Function __f) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIter>); + __glibcpp_function_requires(_InputIteratorConcept<_InputIter>) for ( ; __first != __last; ++__first) __f(*__first); return __f; @@ -231,9 +231,9 @@ namespace std const _Tp& __val) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIter>); + __glibcpp_function_requires(_InputIteratorConcept<_InputIter>) __glibcpp_function_requires(_EqualOpConcept< - typename iterator_traits<_InputIter>::value_type, _Tp>); + typename iterator_traits<_InputIter>::value_type, _Tp>) return find(__first, __last, __val, __iterator_category(__first)); } @@ -243,9 +243,9 @@ namespace std _Predicate __pred) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIter>); + __glibcpp_function_requires(_InputIteratorConcept<_InputIter>) __glibcpp_function_requires(_UnaryPredicateConcept<_Predicate, - typename iterator_traits<_InputIter>::value_type>); + typename iterator_traits<_InputIter>::value_type>) return find_if(__first, __last, __pred, __iterator_category(__first)); } @@ -256,9 +256,9 @@ namespace std adjacent_find(_ForwardIter __first, _ForwardIter __last) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>); + __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>) __glibcpp_function_requires(_EqualityComparableConcept< - typename iterator_traits<_ForwardIter>::value_type>); + typename iterator_traits<_ForwardIter>::value_type>) if (__first == __last) return __last; _ForwardIter __next = __first; @@ -276,10 +276,10 @@ namespace std _BinaryPredicate __binary_pred) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>); + __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>) __glibcpp_function_requires(_BinaryPredicateConcept<_BinaryPredicate, typename iterator_traits<_ForwardIter>::value_type, - typename iterator_traits<_ForwardIter>::value_type>); + typename iterator_traits<_ForwardIter>::value_type>) if (__first == __last) return __last; _ForwardIter __next = __first; @@ -304,10 +304,10 @@ namespace std _Size& __n) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIter>); + __glibcpp_function_requires(_InputIteratorConcept<_InputIter>) __glibcpp_function_requires(_EqualityComparableConcept< - typename iterator_traits<_InputIter>::value_type >); - __glibcpp_function_requires(_EqualityComparableConcept<_Tp>); + typename iterator_traits<_InputIter>::value_type >) + __glibcpp_function_requires(_EqualityComparableConcept<_Tp>) for ( ; __first != __last; ++__first) if (*__first == __value) ++__n; @@ -320,9 +320,9 @@ namespace std _Size& __n) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIter>); + __glibcpp_function_requires(_InputIteratorConcept<_InputIter>) __glibcpp_function_requires(_UnaryPredicateConcept<_Predicate, - typename iterator_traits<_InputIter>::value_type>); + typename iterator_traits<_InputIter>::value_type>) for ( ; __first != __last; ++__first) if (__pred(*__first)) ++__n; @@ -333,10 +333,10 @@ namespace std count(_InputIter __first, _InputIter __last, const _Tp& __value) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIter>); + __glibcpp_function_requires(_InputIteratorConcept<_InputIter>) __glibcpp_function_requires(_EqualityComparableConcept< - typename iterator_traits<_InputIter>::value_type >); - __glibcpp_function_requires(_EqualityComparableConcept<_Tp>); + typename iterator_traits<_InputIter>::value_type >) + __glibcpp_function_requires(_EqualityComparableConcept<_Tp>) typename iterator_traits<_InputIter>::difference_type __n = 0; for ( ; __first != __last; ++__first) if (*__first == __value) @@ -349,9 +349,9 @@ namespace std count_if(_InputIter __first, _InputIter __last, _Predicate __pred) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIter>); + __glibcpp_function_requires(_InputIteratorConcept<_InputIter>) __glibcpp_function_requires(_UnaryPredicateConcept<_Predicate, - typename iterator_traits<_InputIter>::value_type>); + typename iterator_traits<_InputIter>::value_type>) typename iterator_traits<_InputIter>::difference_type __n = 0; for ( ; __first != __last; ++__first) if (__pred(*__first)) @@ -368,11 +368,11 @@ namespace std _ForwardIter2 __first2, _ForwardIter2 __last2) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter1>); - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter2>); + __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter1>) + __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter2>) __glibcpp_function_requires(_EqualOpConcept< typename iterator_traits<_ForwardIter1>::value_type, - typename iterator_traits<_ForwardIter2>::value_type>); + typename iterator_traits<_ForwardIter2>::value_type>) // Test for empty ranges if (__first1 == __last1 || __first2 == __last2) @@ -421,11 +421,11 @@ namespace std _BinaryPred __predicate) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter1>); - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter2>); + __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter1>) + __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter2>) __glibcpp_function_requires(_BinaryPredicateConcept<_BinaryPred, typename iterator_traits<_ForwardIter1>::value_type, - typename iterator_traits<_ForwardIter2>::value_type>); + typename iterator_traits<_ForwardIter2>::value_type>) // Test for empty ranges if (__first1 == __last1 || __first2 == __last2) @@ -483,10 +483,10 @@ namespace std _Integer __count, const _Tp& __val) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>); + __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>) __glibcpp_function_requires(_EqualityComparableConcept< - typename iterator_traits<_ForwardIter>::value_type>); - __glibcpp_function_requires(_EqualityComparableConcept<_Tp>); + typename iterator_traits<_ForwardIter>::value_type>) + __glibcpp_function_requires(_EqualityComparableConcept<_Tp>) if (__count <= 0) return __first; @@ -517,9 +517,9 @@ namespace std _BinaryPred __binary_pred) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>); + __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>) __glibcpp_function_requires(_BinaryPredicateConcept<_BinaryPred, - typename iterator_traits<_ForwardIter>::value_type, _Tp>); + typename iterator_traits<_ForwardIter>::value_type, _Tp>) if (__count <= 0) return __first; @@ -560,14 +560,14 @@ namespace std _ForwardIter2 __first2) { // concept requirements - __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIter1>); - __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIter2>); + __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIter1>) + __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIter2>) __glibcpp_function_requires(_ConvertibleConcept< typename iterator_traits<_ForwardIter1>::value_type, - typename iterator_traits<_ForwardIter2>::value_type>); + typename iterator_traits<_ForwardIter2>::value_type>) __glibcpp_function_requires(_ConvertibleConcept< typename iterator_traits<_ForwardIter2>::value_type, - typename iterator_traits<_ForwardIter1>::value_type>); + typename iterator_traits<_ForwardIter1>::value_type>) for ( ; __first1 != __last1; ++__first1, ++__first2) iter_swap(__first1, __first2); @@ -582,11 +582,11 @@ namespace std _OutputIter __result, _UnaryOperation __unary_op) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIter>); + __glibcpp_function_requires(_InputIteratorConcept<_InputIter>) /* XXX __glibcpp_function_requires(_OutputIteratorConcept<_OutputIter, // should be "the type returned by _UnaryOperation" - typename iterator_traits<_InputIter>::value_type>); + typename iterator_traits<_InputIter>::value_type>) */ for ( ; __first != __last; ++__first, ++__result) @@ -602,12 +602,12 @@ namespace std _BinaryOperation __binary_op) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIter1>); - __glibcpp_function_requires(_InputIteratorConcept<_InputIter2>); + __glibcpp_function_requires(_InputIteratorConcept<_InputIter1>) + __glibcpp_function_requires(_InputIteratorConcept<_InputIter2>) /* XXX __glibcpp_function_requires(_OutputIteratorConcept<_OutputIter, // should be "the type returned by _BinaryOperation" - typename iterator_traits<_InputIter1>::value_type>); + typename iterator_traits<_InputIter1>::value_type>) */ for ( ; __first1 != __last1; ++__first1, ++__first2, ++__result) @@ -623,11 +623,11 @@ namespace std const _Tp& __old_value, const _Tp& __new_value) { // concept requirements - __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIter>); + __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIter>) __glibcpp_function_requires(_EqualOpConcept< - typename iterator_traits<_ForwardIter>::value_type, _Tp>); + typename iterator_traits<_ForwardIter>::value_type, _Tp>) __glibcpp_function_requires(_ConvertibleConcept<_Tp, - typename iterator_traits<_ForwardIter>::value_type>); + typename iterator_traits<_ForwardIter>::value_type>) for ( ; __first != __last; ++__first) if (*__first == __old_value) @@ -640,11 +640,11 @@ namespace std _Predicate __pred, const _Tp& __new_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>) __glibcpp_function_requires(_UnaryPredicateConcept<_Predicate, - typename iterator_traits<_ForwardIter>::value_type>); + typename iterator_traits<_ForwardIter>::value_type>) for ( ; __first != __last; ++__first) if (__pred(*__first)) @@ -658,11 +658,11 @@ namespace std const _Tp& __old_value, const _Tp& __new_value) { // 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>) __glibcpp_function_requires(_EqualOpConcept< - typename iterator_traits<_InputIter>::value_type, _Tp>); + typename iterator_traits<_InputIter>::value_type, _Tp>) for ( ; __first != __last; ++__first, ++__result) *__result = *__first == __old_value ? __new_value : *__first; @@ -677,11 +677,11 @@ namespace std _Predicate __pred, const _Tp& __new_value) { // 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>) __glibcpp_function_requires(_UnaryPredicateConcept<_Predicate, - typename iterator_traits<_InputIter>::value_type>); + typename iterator_traits<_InputIter>::value_type>) for ( ; __first != __last; ++__first, ++__result) *__result = __pred(*__first) ? __new_value : *__first; @@ -695,9 +695,9 @@ namespace std generate(_ForwardIter __first, _ForwardIter __last, _Generator __gen) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>); + __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>) __glibcpp_function_requires(_GeneratorConcept<_Generator, - typename iterator_traits<_ForwardIter>::value_type>); + typename iterator_traits<_ForwardIter>::value_type>) for ( ; __first != __last; ++__first) *__first = __gen(); @@ -710,7 +710,7 @@ namespace std /* // XXX concept requirements __glibcpp_function_requires(_OutputIteratorConcept<_OutputIter, - "the return type of _Generator" ?? >); + "the return type of _Generator" ?? >) */ for ( ; __n > 0; --__n, ++__first) @@ -726,11 +726,11 @@ namespace std _OutputIter __result, const _Tp& __value) { // 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>) __glibcpp_function_requires(_EqualOpConcept< - typename iterator_traits<_InputIter>::value_type, _Tp>); + typename iterator_traits<_InputIter>::value_type, _Tp>) for ( ; __first != __last; ++__first) if (!(*__first == __value)) { @@ -746,11 +746,11 @@ namespace std _OutputIter __result, _Predicate __pred) { // 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>) __glibcpp_function_requires(_UnaryPredicateConcept<_Predicate, - typename iterator_traits<_InputIter>::value_type>); + typename iterator_traits<_InputIter>::value_type>) for ( ; __first != __last; ++__first) if (!__pred(*__first)) { @@ -766,11 +766,11 @@ namespace std const _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>) __glibcpp_function_requires(_EqualOpConcept< - typename iterator_traits<_ForwardIter>::value_type, _Tp>); + typename iterator_traits<_ForwardIter>::value_type, _Tp>) __first = find(__first, __last, __value); _ForwardIter __i = __first; @@ -784,9 +784,9 @@ namespace std _Predicate __pred) { // concept requirements - __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIter>); + __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIter>) __glibcpp_function_requires(_UnaryPredicateConcept<_Predicate, - typename iterator_traits<_ForwardIter>::value_type>); + typename iterator_traits<_ForwardIter>::value_type>) __first = find_if(__first, __last, __pred); _ForwardIter __i = __first; @@ -831,11 +831,11 @@ namespace std _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>) __glibcpp_function_requires(_EqualityComparableConcept< - typename iterator_traits<_InputIter>::value_type>); + typename iterator_traits<_InputIter>::value_type>) typedef typename iterator_traits<_OutputIter>::iterator_category _IterType; @@ -853,7 +853,7 @@ namespace std // concept requirements -- iterators already checked __glibcpp_function_requires(_BinaryPredicateConcept<_BinaryPredicate, typename iterator_traits<_InputIter>::value_type, - typename iterator_traits<_InputIter>::value_type>); + typename iterator_traits<_InputIter>::value_type>) typename iterator_traits<_InputIter>::value_type __value = *__first; *__result = __value; @@ -875,7 +875,7 @@ namespace std // concept requirements -- iterators already checked __glibcpp_function_requires(_BinaryPredicateConcept<_BinaryPredicate, typename iterator_traits<_ForwardIter>::value_type, - typename iterator_traits<_InputIter>::value_type>); + typename iterator_traits<_InputIter>::value_type>) *__result = *__first; while (++__first != __last) @@ -890,9 +890,9 @@ namespace std _BinaryPredicate __binary_pred) { // concept requirements -- predicates checked later - __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 iterator_traits<_OutputIter>::iterator_category _IterType; @@ -906,9 +906,9 @@ __result, __binary_pred, _IterType()); unique(_ForwardIter __first, _ForwardIter __last) { // concept requirements - __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIter>); + __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIter>) __glibcpp_function_requires(_EqualityComparableConcept< - typename iterator_traits<_ForwardIter>::value_type>); + typename iterator_traits<_ForwardIter>::value_type>) __first = adjacent_find(__first, __last); return unique_copy(__first, __last, __first); @@ -920,10 +920,10 @@ __result, __binary_pred, _IterType()); _BinaryPredicate __binary_pred) { // concept requirements - __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIter>); + __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIter>) __glibcpp_function_requires(_BinaryPredicateConcept<_BinaryPredicate, typename iterator_traits<_ForwardIter>::value_type, - typename iterator_traits<_ForwardIter>::value_type>); + typename iterator_traits<_ForwardIter>::value_type>) __first = adjacent_find(__first, __last, __binary_pred); return unique_copy(__first, __last, __first, __binary_pred); @@ -956,7 +956,7 @@ __result, __binary_pred, _IterType()); { // concept requirements __glibcpp_function_requires(_Mutable_BidirectionalIteratorConcept< - _BidirectionalIter>); + _BidirectionalIter>) __reverse(__first, __last, __iterator_category(__first)); } @@ -966,9 +966,9 @@ __result, __binary_pred, _IterType()); _OutputIter __result) { // concept requirements - __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIter>); + __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIter>) __glibcpp_function_requires(_OutputIteratorConcept<_OutputIter, - typename iterator_traits<_BidirectionalIter>::value_type>); + typename iterator_traits<_BidirectionalIter>::value_type>) while (__first != __last) { --__last; @@ -1029,7 +1029,7 @@ __result, __binary_pred, _IterType()); { // concept requirements __glibcpp_function_requires(_Mutable_BidirectionalIteratorConcept< - _BidirectionalIter>); + _BidirectionalIter>) if ((__first == __middle) || (__last == __middle)) return; @@ -1057,7 +1057,7 @@ __result, __binary_pred, _IterType()); { // concept requirements __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept< - _RandomAccessIter>); + _RandomAccessIter>) if ((__first == __middle) || (__last == __middle)) return; @@ -1114,7 +1114,7 @@ __result, __binary_pred, _IterType()); rotate(_ForwardIter __first, _ForwardIter __middle, _ForwardIter __last) { // concept requirements - __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIter>); + __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIter>) typedef typename iterator_traits<_ForwardIter>::iterator_category _IterType; __rotate(__first, __middle, __last, _IterType()); @@ -1126,9 +1126,9 @@ __result, __binary_pred, _IterType()); _ForwardIter __last, _OutputIter __result) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>); + __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>) __glibcpp_function_requires(_OutputIteratorConcept<_OutputIter, - typename iterator_traits<_ForwardIter>::value_type>); + typename iterator_traits<_ForwardIter>::value_type>) return copy(__first, __middle, copy(__middle, __last, __result)); } @@ -1155,7 +1155,7 @@ __result, __binary_pred, _IterType()); { // concept requirements __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept< - _RandomAccessIter>); + _RandomAccessIter>) if (__first == __last) return; for (_RandomAccessIter __i = __first + 1; __i != __last; ++__i) @@ -1169,7 +1169,7 @@ __result, __binary_pred, _IterType()); { // concept requirements __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept< - _RandomAccessIter>); + _RandomAccessIter>) if (__first == __last) return; for (_RandomAccessIter __i = __first + 1; __i != __last; ++__i) @@ -1184,9 +1184,9 @@ __result, __binary_pred, _IterType()); _OutputIter __out, const _Distance __n) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>); + __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>) __glibcpp_function_requires(_OutputIteratorConcept<_OutputIter, - typename iterator_traits<_ForwardIter>::value_type>); + typename iterator_traits<_ForwardIter>::value_type>) _Distance __remaining = distance(__first, __last); _Distance __m = min(__n, __remaining); @@ -1212,11 +1212,11 @@ __result, __binary_pred, _IterType()); _RandomNumberGenerator& __rand) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>); + __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>) __glibcpp_function_requires(_OutputIteratorConcept<_OutputIter, - typename iterator_traits<_ForwardIter>::value_type>); + typename iterator_traits<_ForwardIter>::value_type>) __glibcpp_function_requires(_UnaryFunctionConcept< - _RandomNumberGenerator, _Distance, _Distance>); + _RandomNumberGenerator, _Distance, _Distance>) _Distance __remaining = distance(__first, __last); _Distance __m = min(__n, __remaining); @@ -1266,7 +1266,7 @@ __result, __binary_pred, _IterType()); { // concept requirements __glibcpp_function_requires(_UnaryFunctionConcept< - _RandomNumberGenerator, _Distance, _Distance>); + _RandomNumberGenerator, _Distance, _Distance>) _Distance __m = 0; _Distance __t = __n; @@ -1290,9 +1290,9 @@ __result, __binary_pred, _IterType()); _RandomAccessIter __out_first, _RandomAccessIter __out_last) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIter>); + __glibcpp_function_requires(_InputIteratorConcept<_InputIter>) __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept< - _RandomAccessIter>); + _RandomAccessIter>) return __random_sample(__first, __last, __out_first, __out_last - __out_first); @@ -1307,9 +1307,9 @@ __result, __binary_pred, _IterType()); _RandomNumberGenerator& __rand) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIter>); + __glibcpp_function_requires(_InputIteratorConcept<_InputIter>) __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept< - _RandomAccessIter>); + _RandomAccessIter>) return __random_sample(__first, __last, __out_first, __rand, @@ -1373,9 +1373,9 @@ __result, __binary_pred, _IterType()); _Predicate __pred) { // concept requirements - __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIter>); + __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIter>) __glibcpp_function_requires(_UnaryPredicateConcept<_Predicate, - typename iterator_traits<_ForwardIter>::value_type>); + typename iterator_traits<_ForwardIter>::value_type>) return __partition(__first, __last, __pred, __iterator_category(__first)); } @@ -1447,9 +1447,9 @@ __result, __binary_pred, _IterType()); _Predicate __pred) { // concept requirements - __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIter>); + __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIter>) __glibcpp_function_requires(_UnaryPredicateConcept<_Predicate, - typename iterator_traits<_ForwardIter>::value_type>); + typename iterator_traits<_ForwardIter>::value_type>) if (__first == __last) return __first; @@ -1684,8 +1684,8 @@ __result, __binary_pred, _IterType()); // concept requirements __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept< - _RandomAccessIter>); - __glibcpp_function_requires(_LessThanComparableConcept<_ValueType>); + _RandomAccessIter>) + __glibcpp_function_requires(_LessThanComparableConcept<_ValueType>) if (__first != __last) { __introsort_loop(__first, __last, __lg(__last - __first) * 2); @@ -1701,8 +1701,8 @@ __result, __binary_pred, _IterType()); // concept requirements __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept< - _RandomAccessIter>); - __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, _ValueType, _ValueType>); + _RandomAccessIter>) + __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, _ValueType, _ValueType>) if (__first != __last) { __introsort_loop(__first, __last, __lg(__last - __first) * 2, __comp); @@ -1910,8 +1910,8 @@ __result, __binary_pred, _IterType()); // concept requirements __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept< - _RandomAccessIter>); - __glibcpp_function_requires(_LessThanComparableConcept<_ValueType>); + _RandomAccessIter>) + __glibcpp_function_requires(_LessThanComparableConcept<_ValueType>) _Temporary_buffer<_RandomAccessIter, _ValueType> buf(__first, __last); if (buf.begin() == 0) @@ -1929,9 +1929,9 @@ __result, __binary_pred, _IterType()); // concept requirements __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept< - _RandomAccessIter>); + _RandomAccessIter>) __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, - _ValueType, _ValueType>); + _ValueType, _ValueType>) _Temporary_buffer<_RandomAccessIter, _ValueType> buf(__first, __last); if (buf.begin() == 0) @@ -1951,8 +1951,8 @@ __result, __binary_pred, _IterType()); // concept requirements __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept< - _RandomAccessIter>); - __glibcpp_function_requires(_LessThanComparableConcept<_ValueType>); + _RandomAccessIter>) + __glibcpp_function_requires(_LessThanComparableConcept<_ValueType>) make_heap(__first, __middle); for (_RandomAccessIter __i = __middle; __i < __last; ++__i) @@ -1972,9 +1972,9 @@ __result, __binary_pred, _IterType()); // concept requirements __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept< - _RandomAccessIter>); + _RandomAccessIter>) __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, - _ValueType, _ValueType>); + _ValueType, _ValueType>) make_heap(__first, __middle, __comp); for (_RandomAccessIter __i = __middle; __i < __last; ++__i) @@ -1994,10 +1994,10 @@ __result, __binary_pred, _IterType()); typedef typename iterator_traits<_RandomAccessIter>::difference_type _DistanceType; // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIter>); - __glibcpp_function_requires(_ConvertibleConcept<_InputValueType, _OutputValueType>); - __glibcpp_function_requires(_LessThanComparableConcept<_OutputValueType>); - __glibcpp_function_requires(_LessThanComparableConcept<_InputValueType>); + __glibcpp_function_requires(_InputIteratorConcept<_InputIter>) + __glibcpp_function_requires(_ConvertibleConcept<_InputValueType, _OutputValueType>) + __glibcpp_function_requires(_LessThanComparableConcept<_OutputValueType>) + __glibcpp_function_requires(_LessThanComparableConcept<_InputValueType>) if (__result_first == __result_last) return __result_last; _RandomAccessIter __result_real_last = __result_first; @@ -2030,11 +2030,11 @@ __result, __binary_pred, _IterType()); typedef typename iterator_traits<_RandomAccessIter>::difference_type _DistanceType; // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIter>); - __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<_RandomAccessIter>); - __glibcpp_function_requires(_ConvertibleConcept<_InputValueType, _OutputValueType>); + __glibcpp_function_requires(_InputIteratorConcept<_InputIter>) + __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<_RandomAccessIter>) + __glibcpp_function_requires(_ConvertibleConcept<_InputValueType, _OutputValueType>) __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, - _OutputValueType, _OutputValueType>); + _OutputValueType, _OutputValueType>) if (__result_first == __result_last) return __result_last; _RandomAccessIter __result_real_last = __result_first; @@ -2065,8 +2065,8 @@ __result, __binary_pred, _IterType()); typedef typename iterator_traits<_RandomAccessIter>::value_type _ValueType; // concept requirements - __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<_RandomAccessIter>); - __glibcpp_function_requires(_LessThanComparableConcept<_ValueType>); + __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<_RandomAccessIter>) + __glibcpp_function_requires(_LessThanComparableConcept<_ValueType>) while (__last - __first > 3) { _RandomAccessIter __cut = @@ -2092,9 +2092,9 @@ __result, __binary_pred, _IterType()); typedef typename iterator_traits<_RandomAccessIter>::value_type _ValueType; // concept requirements - __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<_RandomAccessIter>); + __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<_RandomAccessIter>) __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, - _ValueType, _ValueType>); + _ValueType, _ValueType>) while (__last - __first > 3) { _RandomAccessIter __cut = @@ -2123,9 +2123,9 @@ __result, __binary_pred, _IterType()); typedef typename iterator_traits<_ForwardIter>::difference_type _DistanceType; // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>); - __glibcpp_function_requires(_SameTypeConcept<_Tp, _ValueType>); - __glibcpp_function_requires(_LessThanComparableConcept<_Tp>); + __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>) + __glibcpp_function_requires(_SameTypeConcept<_Tp, _ValueType>) + __glibcpp_function_requires(_LessThanComparableConcept<_Tp>) _DistanceType __len = distance(__first, __last); _DistanceType __half; @@ -2155,9 +2155,9 @@ __result, __binary_pred, _IterType()); typedef typename iterator_traits<_ForwardIter>::difference_type _DistanceType; // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>); - __glibcpp_function_requires(_SameTypeConcept<_Tp, _ValueType>); - __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, _Tp, _Tp>); + __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>) + __glibcpp_function_requires(_SameTypeConcept<_Tp, _ValueType>) + __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, _Tp, _Tp>) _DistanceType __len = distance(__first, __last); _DistanceType __half; @@ -2186,9 +2186,9 @@ __result, __binary_pred, _IterType()); typedef typename iterator_traits<_ForwardIter>::difference_type _DistanceType; // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>); - __glibcpp_function_requires(_SameTypeConcept<_Tp, _ValueType>); - __glibcpp_function_requires(_LessThanComparableConcept<_Tp>); + __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>) + __glibcpp_function_requires(_SameTypeConcept<_Tp, _ValueType>) + __glibcpp_function_requires(_LessThanComparableConcept<_Tp>) _DistanceType __len = distance(__first, __last); _DistanceType __half; @@ -2218,9 +2218,9 @@ __result, __binary_pred, _IterType()); typedef typename iterator_traits<_ForwardIter>::difference_type _DistanceType; // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>); - __glibcpp_function_requires(_SameTypeConcept<_Tp, _ValueType>); - __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, _Tp, _Tp>); + __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>) + __glibcpp_function_requires(_SameTypeConcept<_Tp, _ValueType>) + __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, _Tp, _Tp>) _DistanceType __len = distance(__first, __last); _DistanceType __half; @@ -2249,9 +2249,9 @@ __result, __binary_pred, _IterType()); typedef typename iterator_traits<_ForwardIter>::difference_type _DistanceType; // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>); - __glibcpp_function_requires(_SameTypeConcept<_Tp, _ValueType>); - __glibcpp_function_requires(_LessThanComparableConcept<_Tp>); + __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>) + __glibcpp_function_requires(_SameTypeConcept<_Tp, _ValueType>) + __glibcpp_function_requires(_LessThanComparableConcept<_Tp>) _DistanceType __len = distance(__first, __last); _DistanceType __half; @@ -2287,9 +2287,9 @@ __result, __binary_pred, _IterType()); typedef typename iterator_traits<_ForwardIter>::difference_type _DistanceType; // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>); - __glibcpp_function_requires(_SameTypeConcept<_Tp, _ValueType>); - __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, _Tp, _Tp>); + __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>) + __glibcpp_function_requires(_SameTypeConcept<_Tp, _ValueType>) + __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, _Tp, _Tp>) _DistanceType __len = distance(__first, __last); _DistanceType __half; @@ -2322,10 +2322,10 @@ __result, __binary_pred, _IterType()); const _Tp& __val) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>); + __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>) __glibcpp_function_requires(_SameTypeConcept<_Tp, - typename iterator_traits<_ForwardIter>::value_type>); - __glibcpp_function_requires(_LessThanComparableConcept<_Tp>); + typename iterator_traits<_ForwardIter>::value_type>) + __glibcpp_function_requires(_LessThanComparableConcept<_Tp>) _ForwardIter __i = lower_bound(__first, __last, __val); return __i != __last && !(__val < *__i); @@ -2337,10 +2337,10 @@ __result, __binary_pred, _IterType()); const _Tp& __val, _Compare __comp) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>); + __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>) __glibcpp_function_requires(_SameTypeConcept<_Tp, - typename iterator_traits<_ForwardIter>::value_type>); - __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, _Tp, _Tp>); + typename iterator_traits<_ForwardIter>::value_type>) + __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, _Tp, _Tp>) _ForwardIter __i = lower_bound(__first, __last, __val, __comp); return __i != __last && !__comp(__val, *__i); @@ -2355,15 +2355,15 @@ __result, __binary_pred, _IterType()); _OutputIter __result) { // 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(_OutputIteratorConcept<_OutputIter, - typename iterator_traits<_InputIter1>::value_type>); + typename iterator_traits<_InputIter1>::value_type>) __glibcpp_function_requires(_SameTypeConcept< typename iterator_traits<_InputIter1>::value_type, - typename iterator_traits<_InputIter2>::value_type>); + typename iterator_traits<_InputIter2>::value_type>) __glibcpp_function_requires(_LessThanComparableConcept< - typename iterator_traits<_InputIter1>::value_type>); + typename iterator_traits<_InputIter1>::value_type>) while (__first1 != __last1 && __first2 != __last2) { if (*__first2 < *__first1) { @@ -2387,16 +2387,16 @@ __result, __binary_pred, _IterType()); _OutputIter __result, _Compare __comp) { // 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(_SameTypeConcept< typename iterator_traits<_InputIter1>::value_type, - typename iterator_traits<_InputIter2>::value_type>); + typename iterator_traits<_InputIter2>::value_type>) __glibcpp_function_requires(_OutputIteratorConcept<_OutputIter, - typename iterator_traits<_InputIter1>::value_type>); + typename iterator_traits<_InputIter1>::value_type>) __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, typename iterator_traits<_InputIter1>::value_type, - typename iterator_traits<_InputIter2>::value_type>); + typename iterator_traits<_InputIter2>::value_type>) while (__first1 != __last1 && __first2 != __last2) { if (__comp(*__first2, *__first1)) { @@ -2684,8 +2684,8 @@ __result, __binary_pred, _IterType()); // concept requirements __glibcpp_function_requires(_Mutable_BidirectionalIteratorConcept< - _BidirectionalIter>); - __glibcpp_function_requires(_LessThanComparableConcept<_ValueType>); + _BidirectionalIter>) + __glibcpp_function_requires(_LessThanComparableConcept<_ValueType>) if (__first == __middle || __middle == __last) return; @@ -2715,9 +2715,9 @@ __result, __binary_pred, _IterType()); // concept requirements __glibcpp_function_requires(_Mutable_BidirectionalIteratorConcept< - _BidirectionalIter>); + _BidirectionalIter>) __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, - _ValueType, _ValueType>); + _ValueType, _ValueType>) if (__first == __middle || __middle == __last) return; @@ -2745,13 +2745,13 @@ __result, __binary_pred, _IterType()); _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(_SameTypeConcept< typename iterator_traits<_InputIter1>::value_type, - typename iterator_traits<_InputIter2>::value_type>); + typename iterator_traits<_InputIter2>::value_type>) __glibcpp_function_requires(_LessThanComparableConcept< - typename iterator_traits<_InputIter1>::value_type>); + typename iterator_traits<_InputIter1>::value_type>) while (__first1 != __last1 && __first2 != __last2) if (*__first2 < *__first1) @@ -2770,14 +2770,14 @@ __result, __binary_pred, _IterType()); _InputIter2 __first2, _InputIter2 __last2, _Compare __comp) { // 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(_SameTypeConcept< typename iterator_traits<_InputIter1>::value_type, - typename iterator_traits<_InputIter2>::value_type>); + typename iterator_traits<_InputIter2>::value_type>) __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, typename iterator_traits<_InputIter1>::value_type, - typename iterator_traits<_InputIter2>::value_type>); + typename iterator_traits<_InputIter2>::value_type>) while (__first1 != __last1 && __first2 != __last2) if (__comp(*__first2, *__first1)) @@ -2797,15 +2797,15 @@ __result, __binary_pred, _IterType()); _OutputIter __result) { // 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(_OutputIteratorConcept<_OutputIter, - typename iterator_traits<_InputIter1>::value_type>); + typename iterator_traits<_InputIter1>::value_type>) __glibcpp_function_requires(_SameTypeConcept< typename iterator_traits<_InputIter1>::value_type, - typename iterator_traits<_InputIter2>::value_type>); + typename iterator_traits<_InputIter2>::value_type>) __glibcpp_function_requires(_LessThanComparableConcept< - typename iterator_traits<_InputIter1>::value_type>); + typename iterator_traits<_InputIter1>::value_type>) while (__first1 != __last1 && __first2 != __last2) { if (*__first1 < *__first2) { @@ -2834,16 +2834,16 @@ __result, __binary_pred, _IterType()); _OutputIter __result, _Compare __comp) { // 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(_SameTypeConcept< typename iterator_traits<_InputIter1>::value_type, - typename iterator_traits<_InputIter2>::value_type>); + typename iterator_traits<_InputIter2>::value_type>) __glibcpp_function_requires(_OutputIteratorConcept<_OutputIter, - typename iterator_traits<_InputIter1>::value_type>); + typename iterator_traits<_InputIter1>::value_type>) __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, typename iterator_traits<_InputIter1>::value_type, - typename iterator_traits<_InputIter2>::value_type>); + typename iterator_traits<_InputIter2>::value_type>) while (__first1 != __last1 && __first2 != __last2) { if (__comp(*__first1, *__first2)) { @@ -2871,15 +2871,15 @@ __result, __binary_pred, _IterType()); _OutputIter __result) { // 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(_OutputIteratorConcept<_OutputIter, - typename iterator_traits<_InputIter1>::value_type>); + typename iterator_traits<_InputIter1>::value_type>) __glibcpp_function_requires(_SameTypeConcept< typename iterator_traits<_InputIter1>::value_type, - typename iterator_traits<_InputIter2>::value_type>); + typename iterator_traits<_InputIter2>::value_type>) __glibcpp_function_requires(_LessThanComparableConcept< - typename iterator_traits<_InputIter1>::value_type>); + typename iterator_traits<_InputIter1>::value_type>) while (__first1 != __last1 && __first2 != __last2) if (*__first1 < *__first2) @@ -2903,16 +2903,16 @@ __result, __binary_pred, _IterType()); _OutputIter __result, _Compare __comp) { // 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(_SameTypeConcept< typename iterator_traits<_InputIter1>::value_type, - typename iterator_traits<_InputIter2>::value_type>); + typename iterator_traits<_InputIter2>::value_type>) __glibcpp_function_requires(_OutputIteratorConcept<_OutputIter, - typename iterator_traits<_InputIter1>::value_type>); + typename iterator_traits<_InputIter1>::value_type>) __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, typename iterator_traits<_InputIter1>::value_type, - typename iterator_traits<_InputIter2>::value_type>); + typename iterator_traits<_InputIter2>::value_type>) while (__first1 != __last1 && __first2 != __last2) if (__comp(*__first1, *__first2)) @@ -2935,15 +2935,15 @@ __result, __binary_pred, _IterType()); _OutputIter __result) { // 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(_OutputIteratorConcept<_OutputIter, - typename iterator_traits<_InputIter1>::value_type>); + typename iterator_traits<_InputIter1>::value_type>) __glibcpp_function_requires(_SameTypeConcept< typename iterator_traits<_InputIter1>::value_type, - typename iterator_traits<_InputIter2>::value_type>); + typename iterator_traits<_InputIter2>::value_type>) __glibcpp_function_requires(_LessThanComparableConcept< - typename iterator_traits<_InputIter1>::value_type>); + typename iterator_traits<_InputIter1>::value_type>) while (__first1 != __last1 && __first2 != __last2) if (*__first1 < *__first2) { @@ -2968,16 +2968,16 @@ __result, __binary_pred, _IterType()); _OutputIter __result, _Compare __comp) { // 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(_SameTypeConcept< typename iterator_traits<_InputIter1>::value_type, - typename iterator_traits<_InputIter2>::value_type>); + typename iterator_traits<_InputIter2>::value_type>) __glibcpp_function_requires(_OutputIteratorConcept<_OutputIter, - typename iterator_traits<_InputIter1>::value_type>); + typename iterator_traits<_InputIter1>::value_type>) __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, typename iterator_traits<_InputIter1>::value_type, - typename iterator_traits<_InputIter2>::value_type>); + typename iterator_traits<_InputIter2>::value_type>) while (__first1 != __last1 && __first2 != __last2) if (__comp(*__first1, *__first2)) { @@ -3001,15 +3001,15 @@ __result, __binary_pred, _IterType()); _OutputIter __result) { // 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(_OutputIteratorConcept<_OutputIter, - typename iterator_traits<_InputIter1>::value_type>); + typename iterator_traits<_InputIter1>::value_type>) __glibcpp_function_requires(_SameTypeConcept< typename iterator_traits<_InputIter1>::value_type, - typename iterator_traits<_InputIter2>::value_type>); + typename iterator_traits<_InputIter2>::value_type>) __glibcpp_function_requires(_LessThanComparableConcept< - typename iterator_traits<_InputIter1>::value_type>); + typename iterator_traits<_InputIter1>::value_type>) while (__first1 != __last1 && __first2 != __last2) if (*__first1 < *__first2) { @@ -3038,16 +3038,16 @@ __result, __binary_pred, _IterType()); _Compare __comp) { // 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(_SameTypeConcept< typename iterator_traits<_InputIter1>::value_type, - typename iterator_traits<_InputIter2>::value_type>); + typename iterator_traits<_InputIter2>::value_type>) __glibcpp_function_requires(_OutputIteratorConcept<_OutputIter, - typename iterator_traits<_InputIter1>::value_type>); + typename iterator_traits<_InputIter1>::value_type>) __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, typename iterator_traits<_InputIter1>::value_type, - typename iterator_traits<_InputIter2>::value_type>); + typename iterator_traits<_InputIter2>::value_type>) while (__first1 != __last1 && __first2 != __last2) if (__comp(*__first1, *__first2)) { @@ -3075,9 +3075,9 @@ __result, __binary_pred, _IterType()); max_element(_ForwardIter __first, _ForwardIter __last) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>); + __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>) __glibcpp_function_requires(_LessThanComparableConcept< - typename iterator_traits<_ForwardIter>::value_type>); + typename iterator_traits<_ForwardIter>::value_type>) if (__first == __last) return __first; _ForwardIter __result = __first; @@ -3093,10 +3093,10 @@ __result, __binary_pred, _IterType()); _Compare __comp) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>); + __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>) __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, typename iterator_traits<_ForwardIter>::value_type, - typename iterator_traits<_ForwardIter>::value_type>); + typename iterator_traits<_ForwardIter>::value_type>) if (__first == __last) return __first; _ForwardIter __result = __first; @@ -3110,9 +3110,9 @@ __result, __binary_pred, _IterType()); min_element(_ForwardIter __first, _ForwardIter __last) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>); + __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>) __glibcpp_function_requires(_LessThanComparableConcept< - typename iterator_traits<_ForwardIter>::value_type>); + typename iterator_traits<_ForwardIter>::value_type>) if (__first == __last) return __first; _ForwardIter __result = __first; @@ -3128,10 +3128,10 @@ __result, __binary_pred, _IterType()); _Compare __comp) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>); + __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>) __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, typename iterator_traits<_ForwardIter>::value_type, - typename iterator_traits<_ForwardIter>::value_type>); + typename iterator_traits<_ForwardIter>::value_type>) if (__first == __last) return __first; _ForwardIter __result = __first; @@ -3149,9 +3149,9 @@ __result, __binary_pred, _IterType()); next_permutation(_BidirectionalIter __first, _BidirectionalIter __last) { // concept requirements - __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIter>); + __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIter>) __glibcpp_function_requires(_LessThanComparableConcept< - typename iterator_traits<_BidirectionalIter>::value_type>); + typename iterator_traits<_BidirectionalIter>::value_type>) if (__first == __last) return false; @@ -3186,10 +3186,10 @@ __result, __binary_pred, _IterType()); _Compare __comp) { // concept requirements - __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIter>); + __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIter>) __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, typename iterator_traits<_BidirectionalIter>::value_type, - typename iterator_traits<_BidirectionalIter>::value_type>); + typename iterator_traits<_BidirectionalIter>::value_type>) if (__first == __last) return false; @@ -3223,9 +3223,9 @@ __result, __binary_pred, _IterType()); prev_permutation(_BidirectionalIter __first, _BidirectionalIter __last) { // concept requirements - __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIter>); + __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIter>) __glibcpp_function_requires(_LessThanComparableConcept< - typename iterator_traits<_BidirectionalIter>::value_type>); + typename iterator_traits<_BidirectionalIter>::value_type>) if (__first == __last) return false; @@ -3260,10 +3260,10 @@ __result, __binary_pred, _IterType()); _Compare __comp) { // concept requirements - __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIter>); + __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIter>) __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, typename iterator_traits<_BidirectionalIter>::value_type, - typename iterator_traits<_BidirectionalIter>::value_type>); + typename iterator_traits<_BidirectionalIter>::value_type>) if (__first == __last) return false; @@ -3300,11 +3300,11 @@ __result, __binary_pred, _IterType()); _ForwardIter __first2, _ForwardIter __last2) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIter>); - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>); + __glibcpp_function_requires(_InputIteratorConcept<_InputIter>) + __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>) __glibcpp_function_requires(_EqualOpConcept< typename iterator_traits<_InputIter>::value_type, - typename iterator_traits<_ForwardIter>::value_type>); + typename iterator_traits<_ForwardIter>::value_type>) for ( ; __first1 != __last1; ++__first1) for (_ForwardIter __iter = __first2; __iter != __last2; ++__iter) @@ -3320,14 +3320,14 @@ __result, __binary_pred, _IterType()); _BinaryPredicate __comp) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIter>); - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>); + __glibcpp_function_requires(_InputIteratorConcept<_InputIter>) + __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>) __glibcpp_function_requires(_EqualOpConcept< typename iterator_traits<_InputIter>::value_type, - typename iterator_traits<_ForwardIter>::value_type>); + typename iterator_traits<_ForwardIter>::value_type>) __glibcpp_function_requires(_BinaryPredicateConcept<_BinaryPredicate, typename iterator_traits<_InputIter>::value_type, - typename iterator_traits<_ForwardIter>::value_type>); + typename iterator_traits<_ForwardIter>::value_type>) for ( ; __first1 != __last1; ++__first1) for (_ForwardIter __iter = __first2; __iter != __last2; ++__iter) @@ -3401,8 +3401,8 @@ __result, __binary_pred, _IterType()); bidirectional_iterator_tag, bidirectional_iterator_tag) { // concept requirements - __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIter1>); - __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIter2>); + __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIter1>) + __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIter2>) typedef reverse_iterator<_BidirectionalIter1> _RevIter1; typedef reverse_iterator<_BidirectionalIter2> _RevIter2; @@ -3430,8 +3430,8 @@ __result, __binary_pred, _IterType()); _BinaryPredicate __comp) { // concept requirements - __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIter1>); - __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIter2>); + __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIter1>) + __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIter2>) typedef reverse_iterator<_BidirectionalIter1> _RevIter1; typedef reverse_iterator<_BidirectionalIter2> _RevIter2; @@ -3459,11 +3459,11 @@ __result, __binary_pred, _IterType()); _ForwardIter2 __first2, _ForwardIter2 __last2) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter1>); - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter2>); + __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter1>) + __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter2>) __glibcpp_function_requires(_EqualOpConcept< typename iterator_traits<_ForwardIter1>::value_type, - typename iterator_traits<_ForwardIter2>::value_type>); + typename iterator_traits<_ForwardIter2>::value_type>) return __find_end(__first1, __last1, __first2, __last2, __iterator_category(__first1), @@ -3478,11 +3478,11 @@ __result, __binary_pred, _IterType()); _BinaryPredicate __comp) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter1>); - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter2>); + __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter1>) + __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter2>) __glibcpp_function_requires(_BinaryPredicateConcept<_BinaryPredicate, typename iterator_traits<_ForwardIter1>::value_type, - typename iterator_traits<_ForwardIter2>::value_type>); + typename iterator_traits<_ForwardIter2>::value_type>) return __find_end(__first1, __last1, __first2, __last2, __iterator_category(__first1), @@ -3529,9 +3529,9 @@ __result, __binary_pred, _IterType()); is_heap(_RandomAccessIter __first, _RandomAccessIter __last) { // concept requirements - __glibcpp_function_requires(_RandomAccessIteratorConcept<_RandomAccessIter>); + __glibcpp_function_requires(_RandomAccessIteratorConcept<_RandomAccessIter>) __glibcpp_function_requires(_LessThanComparableConcept< - typename iterator_traits<_RandomAccessIter>::value_type>); + typename iterator_traits<_RandomAccessIter>::value_type>) return __is_heap(__first, __last - __first); } @@ -3543,10 +3543,10 @@ __result, __binary_pred, _IterType()); _StrictWeakOrdering __comp) { // concept requirements - __glibcpp_function_requires(_RandomAccessIteratorConcept<_RandomAccessIter>); + __glibcpp_function_requires(_RandomAccessIteratorConcept<_RandomAccessIter>) __glibcpp_function_requires(_BinaryPredicateConcept<_StrictWeakOrdering, typename iterator_traits<_RandomAccessIter>::value_type, - typename iterator_traits<_RandomAccessIter>::value_type>); + typename iterator_traits<_RandomAccessIter>::value_type>) return __is_heap(__first, __comp, __last - __first); } @@ -3560,9 +3560,9 @@ __result, __binary_pred, _IterType()); is_sorted(_ForwardIter __first, _ForwardIter __last) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>); + __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>) __glibcpp_function_requires(_LessThanComparableConcept< - typename iterator_traits<_ForwardIter>::value_type>); + typename iterator_traits<_ForwardIter>::value_type>) if (__first == __last) return true; @@ -3581,10 +3581,10 @@ __result, __binary_pred, _IterType()); is_sorted(_ForwardIter __first, _ForwardIter __last, _StrictWeakOrdering __comp) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>); + __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIter>) __glibcpp_function_requires(_BinaryPredicateConcept<_StrictWeakOrdering, typename iterator_traits<_ForwardIter>::value_type, - typename iterator_traits<_ForwardIter>::value_type>); + typename iterator_traits<_ForwardIter>::value_type>) if (__first == __last) return true; diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h index bd8c62502ae..7c5c6a02863 100644 --- a/libstdc++-v3/include/bits/stl_algobase.h +++ b/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); } diff --git a/libstdc++-v3/include/bits/stl_deque.h b/libstdc++-v3/include/bits/stl_deque.h index 7cc4492040b..34eafc23934 100644 --- a/libstdc++-v3/include/bits/stl_deque.h +++ b/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 diff --git a/libstdc++-v3/include/bits/stl_heap.h b/libstdc++-v3/include/bits/stl_heap.h index eebf2ca3b7e..8f4d06804cd 100644 --- a/libstdc++-v3/include/bits/stl_heap.h +++ b/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); diff --git a/libstdc++-v3/include/bits/stl_iterator_base_funcs.h b/libstdc++-v3/include/bits/stl_iterator_base_funcs.h index 97eb8b5208d..07fc896fad8 100644 --- a/libstdc++-v3/include/bits/stl_iterator_base_funcs.h +++ b/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; } diff --git a/libstdc++-v3/include/bits/stl_list.h b/libstdc++-v3/include/bits/stl_list.h index 275699e94d3..d699dcd21ac 100644 --- a/libstdc++-v3/include/bits/stl_list.h +++ b/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: diff --git a/libstdc++-v3/include/bits/stl_map.h b/libstdc++-v3/include/bits/stl_map.h index 97850026872..45f3d588ade 100644 --- a/libstdc++-v3/include/bits/stl_map.h +++ b/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: diff --git a/libstdc++-v3/include/bits/stl_multimap.h b/libstdc++-v3/include/bits/stl_multimap.h index a535e73bba8..f812e37216f 100644 --- a/libstdc++-v3/include/bits/stl_multimap.h +++ b/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: diff --git a/libstdc++-v3/include/bits/stl_multiset.h b/libstdc++-v3/include/bits/stl_multiset.h index edeedd16160..8aa207dffb3 100644 --- a/libstdc++-v3/include/bits/stl_multiset.h +++ b/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: diff --git a/libstdc++-v3/include/bits/stl_numeric.h b/libstdc++-v3/include/bits/stl_numeric.h index 868143189c8..65083f703f0 100644 --- a/libstdc++-v3/include/bits/stl_numeric.h +++ b/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++; diff --git a/libstdc++-v3/include/bits/stl_queue.h b/libstdc++-v3/include/bits/stl_queue.h index 7bf33c1314b..7b2ae94e380 100644 --- a/libstdc++-v3/include/bits/stl_queue.h +++ b/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); diff --git a/libstdc++-v3/include/bits/stl_set.h b/libstdc++-v3/include/bits/stl_set.h index a9705c56980..880e5f6a95b 100644 --- a/libstdc++-v3/include/bits/stl_set.h +++ b/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: diff --git a/libstdc++-v3/include/bits/stl_stack.h b/libstdc++-v3/include/bits/stl_stack.h index 5353e4318b9..b0bca258bc5 100644 --- a/libstdc++-v3/include/bits/stl_stack.h +++ b/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); diff --git a/libstdc++-v3/include/bits/stl_vector.h b/libstdc++-v3/include/bits/stl_vector.h index 8237c3e23b1..4ac20ba8dbc 100644 --- a/libstdc++-v3/include/bits/stl_vector.h +++ b/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; |