diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2003-07-05 04:05:45 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2003-07-05 04:05:45 +0000 |
| commit | 3d7c150e3f05f0dc6e15c1517c4a652c3ecbcfd8 (patch) | |
| tree | 01daea8defdbdbfae1385af0f177ec7506e8ca8d /libstdc++-v3/include/bits | |
| parent | 34cd5ae762a4ee023dafb062b1fd35d9e9d67cbe (diff) | |
| download | gcc-3d7c150e3f05f0dc6e15c1517c4a652c3ecbcfd8.zip gcc-3d7c150e3f05f0dc6e15c1517c4a652c3ecbcfd8.tar.gz gcc-3d7c150e3f05f0dc6e15c1517c4a652c3ecbcfd8.tar.bz2 | |
Move from CPP to CXX.
2003-07-04 Benjamin Kosnik <bkoz@redhat.com>
Move from CPP to CXX.
* include/bits/c++config: Move to GLIBCXX from GLIBCPP.
* testsuite/Makefile.am: Same.
* testsuite/Makefile.in: Regenerate.
* po/Makefile.am: Same.
* po/Makefile.in: Regenerate.
* libsupc++/Makefile.am: Same.
* libsupc++/Makefile.in: Regenerate.
* libmath/Makefile.am: Same.
* libmath/Makefile.in: Regenerate.
* include/Makefile.am: Same.
* include/Makefile.in: Regenerate.
* src/Makefile.am: Same.
* src/Makefile.in: Regenerate.
* acconfig.h: Same.
* configure.host: Same.
* configure.in: Same.
* configure: Regenerate.
* acinclude.m4: Same.
* aclocal.m4: Same.
* src: Change all files in this directory.
* testsuite: Same.
* include: Same, standardize include guards.
* config: Same.
* libsupc++: Same.
From-SVN: r68958
Diffstat (limited to 'libstdc++-v3/include/bits')
64 files changed, 789 insertions, 779 deletions
diff --git a/libstdc++-v3/include/bits/allocator.h b/libstdc++-v3/include/bits/allocator.h index b6dec02..a5bcaf5 100644 --- a/libstdc++-v3/include/bits/allocator.h +++ b/libstdc++-v3/include/bits/allocator.h @@ -206,7 +206,7 @@ namespace std // Inhibit implicit instantiations for required instantiations, // which are defined via explicit instantiations elsewhere. // NB: This syntax is a GNU extension. -#if _GLIBCPP_EXTERN_TEMPLATE +#if _GLIBCXX_EXTERN_TEMPLATE extern template class allocator<char>; extern template class allocator<wchar_t>; #endif diff --git a/libstdc++-v3/include/bits/basic_ios.h b/libstdc++-v3/include/bits/basic_ios.h index 98b73ca..f2e468e 100644 --- a/libstdc++-v3/include/bits/basic_ios.h +++ b/libstdc++-v3/include/bits/basic_ios.h @@ -33,8 +33,8 @@ * You should not attempt to use it directly. */ -#ifndef _CPP_BITS_BASICIOS_H -#define _CPP_BITS_BASICIOS_H 1 +#ifndef _BASIC_IOS_H +#define _BASIC_IOS_H 1 #pragma GCC system_header @@ -441,9 +441,9 @@ namespace std }; } // namespace std -#ifdef _GLIBCPP_NO_TEMPLATE_EXPORT +#ifdef _GLIBCXX_NO_TEMPLATE_EXPORT # define export #include <bits/basic_ios.tcc> #endif -#endif /* _CPP_BITS_BASICIOS_H */ +#endif /* _BASIC_IOS_H */ diff --git a/libstdc++-v3/include/bits/basic_ios.tcc b/libstdc++-v3/include/bits/basic_ios.tcc index bb53168..d0a8ff3 100644 --- a/libstdc++-v3/include/bits/basic_ios.tcc +++ b/libstdc++-v3/include/bits/basic_ios.tcc @@ -27,8 +27,8 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#ifndef _CPP_BITS_BASICIOS_TCC -#define _CPP_BITS_BASICIOS_TCC 1 +#ifndef _BASIC_IOS_TCC +#define _BASIC_IOS_TCC 1 #pragma GCC system_header @@ -176,10 +176,10 @@ namespace std // Inhibit implicit instantiations for required instantiations, // which are defined via explicit instantiations elsewhere. // NB: This syntax is a GNU extension. -#if _GLIBCPP_EXTERN_TEMPLATE +#if _GLIBCXX_EXTERN_TEMPLATE extern template class basic_ios<char>; -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T extern template class basic_ios<wchar_t>; #endif #endif diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index 7942c76..8a9d562 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -37,8 +37,8 @@ * You should not attempt to use it directly. */ -#ifndef _CPP_BITS_STRING_H -#define _CPP_BITS_STRING_H 1 +#ifndef _BASIC_STRING_H +#define _BASIC_STRING_H 1 #pragma GCC system_header @@ -875,7 +875,7 @@ namespace std int compare(const _CharT* __s) const; - // _GLIBCPP_RESOLVE_LIB_DEFECTS + // _GLIBCXX_RESOLVE_LIB_DEFECTS // 5 String::compare specification questionable int compare(size_type __pos, size_type __n1, const _CharT* __s) const; @@ -1074,4 +1074,4 @@ namespace std basic_string<_CharT, _Traits, _Alloc>& __str); } // namespace std -#endif /* _CPP_BITS_STRING_H */ +#endif /* _BASIC_STRING_H */ diff --git a/libstdc++-v3/include/bits/basic_string.tcc b/libstdc++-v3/include/bits/basic_string.tcc index 826e418..fb46c4c 100644 --- a/libstdc++-v3/include/bits/basic_string.tcc +++ b/libstdc++-v3/include/bits/basic_string.tcc @@ -38,8 +38,8 @@ // Written by Jason Merrill based upon the specification by Takanori Adachi // in ANSI X3J16/94-0013R2. Rewritten by Nathan Myers to ISO-14882. -#ifndef _CPP_BITS_STRING_TCC -#define _CPP_BITS_STRING_TCC 1 +#ifndef _BASIC_STRING_TCC +#define _BASIC_STRING_TCC 1 #pragma GCC system_header @@ -502,7 +502,7 @@ namespace std _S_create(size_t __capacity, const _Alloc& __alloc) { typedef basic_string<_CharT, _Traits, _Alloc> __string_type; -#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS +#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS // 83. String::npos vs. string::max_size() if (__capacity > _S_max_size) #else @@ -1057,7 +1057,7 @@ namespace std // Inhibit implicit instantiations for required instantiations, // which are defined via explicit instantiations elsewhere. // NB: This syntax is a GNU extension. -#if _GLIBCPP_EXTERN_TEMPLATE +#if _GLIBCXX_EXTERN_TEMPLATE extern template class basic_string<char>; extern template basic_istream<char>& @@ -1072,7 +1072,7 @@ namespace std basic_istream<char>& getline(basic_istream<char>&, string&); -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T extern template class basic_string<wchar_t>; extern template basic_istream<wchar_t>& diff --git a/libstdc++-v3/include/bits/boost_concept_check.h b/libstdc++-v3/include/bits/boost_concept_check.h index a6a94a2..b3ef7af 100644 --- a/libstdc++-v3/include/bits/boost_concept_check.h +++ b/libstdc++-v3/include/bits/boost_concept_check.h @@ -13,15 +13,15 @@ * You should not attempt to use it directly. */ -#ifndef _GLIBCPP_BOOST_CONCEPT_CHECK -#define _GLIBCPP_BOOST_CONCEPT_CHECK 1 +#ifndef _BOOST_CONCEPT_CHECK_H +#define _BOOST_CONCEPT_CHECK_H 1 #pragma GCC system_header + #include <cstddef> // for ptrdiff_t, used next #include <bits/stl_iterator_base_types.h> // for traits and tags #include <utility> // for pair<> - namespace __gnu_cxx { @@ -38,7 +38,7 @@ inline void __function_requires() // ??? Should the "concept_checking*" structs begin with more than _ ? -#define _GLIBCPP_CLASS_REQUIRES(_type_var, _ns, _concept) \ +#define _GLIBCXX_CLASS_REQUIRES(_type_var, _ns, _concept) \ typedef void (_ns::_concept <_type_var>::* _func##_type_var##_concept)(); \ template <_func##_type_var##_concept _Tp1> \ struct _concept_checking##_type_var##_concept { }; \ @@ -46,7 +46,7 @@ inline void __function_requires() &_ns::_concept <_type_var>::__constraints> \ _concept_checking_typedef##_type_var##_concept -#define _GLIBCPP_CLASS_REQUIRES2(_type_var1, _type_var2, _ns, _concept) \ +#define _GLIBCXX_CLASS_REQUIRES2(_type_var1, _type_var2, _ns, _concept) \ typedef void (_ns::_concept <_type_var1,_type_var2>::* _func##_type_var1##_type_var2##_concept)(); \ template <_func##_type_var1##_type_var2##_concept _Tp1> \ struct _concept_checking##_type_var1##_type_var2##_concept { }; \ @@ -54,7 +54,7 @@ inline void __function_requires() &_ns::_concept <_type_var1,_type_var2>::__constraints> \ _concept_checking_typedef##_type_var1##_type_var2##_concept -#define _GLIBCPP_CLASS_REQUIRES3(_type_var1, _type_var2, _type_var3, _ns, _concept) \ +#define _GLIBCXX_CLASS_REQUIRES3(_type_var1, _type_var2, _type_var3, _ns, _concept) \ typedef void (_ns::_concept <_type_var1,_type_var2,_type_var3>::* _func##_type_var1##_type_var2##_type_var3##_concept)(); \ template <_func##_type_var1##_type_var2##_type_var3##_concept _Tp1> \ struct _concept_checking##_type_var1##_type_var2##_type_var3##_concept { }; \ @@ -62,7 +62,7 @@ inline void __function_requires() &_ns::_concept <_type_var1,_type_var2,_type_var3>::__constraints> \ _concept_checking_typedef##_type_var1##_type_var2##_type_var3##_concept -#define _GLIBCPP_CLASS_REQUIRES4(_type_var1, _type_var2, _type_var3, _type_var4, _ns, _concept) \ +#define _GLIBCXX_CLASS_REQUIRES4(_type_var1, _type_var2, _type_var3, _type_var4, _ns, _concept) \ typedef void (_ns::_concept <_type_var1,_type_var2,_type_var3,_type_var4>::* _func##_type_var1##_type_var2##_type_var3##_type_var4##_concept)(); \ template <_func##_type_var1##_type_var2##_type_var3##_type_var4##_concept _Tp1> \ struct _concept_checking##_type_var1##_type_var2##_type_var3##_type_var4##_concept { }; \ @@ -240,7 +240,7 @@ struct _Aux_require_same<_Tp,_Tp> { typedef _Tp _Type; }; _Tp __a, __b; }; -#define _GLIBCPP_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(_OP,_NAME) \ +#define _GLIBCXX_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(_OP,_NAME) \ template <class _First, class _Second> \ struct _NAME { \ void __constraints() { (void)__constraints_(); } \ @@ -251,7 +251,7 @@ struct _Aux_require_same<_Tp,_Tp> { typedef _Tp _Type; }; _Second __b; \ } -#define _GLIBCPP_DEFINE_BINARY_OPERATOR_CONSTRAINT(_OP,_NAME) \ +#define _GLIBCXX_DEFINE_BINARY_OPERATOR_CONSTRAINT(_OP,_NAME) \ template <class _Ret, class _First, class _Second> \ struct _NAME { \ void __constraints() { (void)__constraints_(); } \ @@ -262,21 +262,21 @@ struct _Aux_require_same<_Tp,_Tp> { typedef _Tp _Type; }; _Second __b; \ } - _GLIBCPP_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(==, _EqualOpConcept); - _GLIBCPP_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(!=, _NotEqualOpConcept); - _GLIBCPP_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(<, _LessThanOpConcept); - _GLIBCPP_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(<=, _LessEqualOpConcept); - _GLIBCPP_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(>, _GreaterThanOpConcept); - _GLIBCPP_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(>=, _GreaterEqualOpConcept); + _GLIBCXX_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(==, _EqualOpConcept); + _GLIBCXX_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(!=, _NotEqualOpConcept); + _GLIBCXX_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(<, _LessThanOpConcept); + _GLIBCXX_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(<=, _LessEqualOpConcept); + _GLIBCXX_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(>, _GreaterThanOpConcept); + _GLIBCXX_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(>=, _GreaterEqualOpConcept); - _GLIBCPP_DEFINE_BINARY_OPERATOR_CONSTRAINT(+, _PlusOpConcept); - _GLIBCPP_DEFINE_BINARY_OPERATOR_CONSTRAINT(*, _TimesOpConcept); - _GLIBCPP_DEFINE_BINARY_OPERATOR_CONSTRAINT(/, _DivideOpConcept); - _GLIBCPP_DEFINE_BINARY_OPERATOR_CONSTRAINT(-, _SubtractOpConcept); - _GLIBCPP_DEFINE_BINARY_OPERATOR_CONSTRAINT(%, _ModOpConcept); + _GLIBCXX_DEFINE_BINARY_OPERATOR_CONSTRAINT(+, _PlusOpConcept); + _GLIBCXX_DEFINE_BINARY_OPERATOR_CONSTRAINT(*, _TimesOpConcept); + _GLIBCXX_DEFINE_BINARY_OPERATOR_CONSTRAINT(/, _DivideOpConcept); + _GLIBCXX_DEFINE_BINARY_OPERATOR_CONSTRAINT(-, _SubtractOpConcept); + _GLIBCXX_DEFINE_BINARY_OPERATOR_CONSTRAINT(%, _ModOpConcept); -#undef _GLIBCPP_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT -#undef _GLIBCPP_DEFINE_BINARY_OPERATOR_CONSTRAINT +#undef _GLIBCXX_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT +#undef _GLIBCXX_DEFINE_BINARY_OPERATOR_CONSTRAINT //=========================================================================== // Function Object Concepts @@ -896,6 +896,6 @@ struct _Aux_require_same<_Tp,_Tp> { typedef _Tp _Type; }; #undef _IsUnused -#endif // _GLIBCPP_BOOST_CONCEPT_CHECK +#endif // _GLIBCXX_BOOST_CONCEPT_CHECK diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config index e9969c0..169394a 100644 --- a/libstdc++-v3/include/bits/c++config +++ b/libstdc++-v3/include/bits/c++config @@ -28,17 +28,17 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#ifndef _CPP_CPPCONFIG -#define _CPP_CPPCONFIG 1 +#ifndef _CXXCONFIG +#define _CXXCONFIG 1 // Pick up any OS-specific definitions. #include <bits/os_defines.h> // The current version of the C++ library in compressed ISO date format. -#define __GLIBCPP__ 20030705 +#define __GLIBCXX__ 20030704 // This is necessary until GCC supports separate template compilation. -#define _GLIBCPP_NO_TEMPLATE_EXPORT 1 +#define _GLIBCXX_NO_TEMPLATE_EXPORT 1 // This is a hack around not having either pre-compiled headers or // export compilation. If defined, the io, string, and valarray @@ -47,7 +47,7 @@ // types. For the io library, this means that larger, out-of-line // member functions are only declared, and definitions are not parsed // by the compiler, but instead instantiated into the library binary. -#define _GLIBCPP_FULLY_COMPLIANT_HEADERS 1 +#define _GLIBCXX_FULLY_COMPLIANT_HEADERS 1 // Allow use of the GNU syntax extension, "extern template." This // extension is fully documented in the g++ manual, but in a nutshell, @@ -55,18 +55,18 @@ // library to avoid multiple weak definitions for required types that // are already explicitly instantiated in the library binary. This // substantially reduces the binary size of resulting executables. -#ifndef _GLIBCPP_EXTERN_TEMPLATE -# define _GLIBCPP_EXTERN_TEMPLATE 1 +#ifndef _GLIBCXX_EXTERN_TEMPLATE +# define _GLIBCXX_EXTERN_TEMPLATE 1 #endif // To enable older, ARM-style iostreams and other anachronisms use this. -//#define _GLIBCPP_DEPRECATED 1 +//#define _GLIBCXX_DEPRECATED 1 // Use corrected code from the committee library group's issues list. -#define _GLIBCPP_RESOLVE_LIB_DEFECTS 1 +#define _GLIBCXX_RESOLVE_LIB_DEFECTS 1 // Hopefully temporary workaround to autoconf/m4 issue with quoting '@'. -#define _GLIBCPP_AT_AT "@@" +#define _GLIBCXX_AT_AT "@@" // In those parts of the standard C++ library that use a mutex instead // of a spin-lock, we now unconditionally use GCC's gthr.h mutex @@ -92,9 +92,9 @@ // Create a boolean flag to be used to determine if --fast-math is set. #ifdef __FAST_MATH__ -# define _GLIBCPP_FAST_MATH 1 +# define _GLIBCXX_FAST_MATH 1 #else -# define _GLIBCPP_FAST_MATH 0 +# define _GLIBCXX_FAST_MATH 0 #endif // This marks string literals in header files to be extracted for eventual diff --git a/libstdc++-v3/include/bits/char_traits.h b/libstdc++-v3/include/bits/char_traits.h index 2b733cd..a6d1d8c 100644 --- a/libstdc++-v3/include/bits/char_traits.h +++ b/libstdc++-v3/include/bits/char_traits.h @@ -37,8 +37,8 @@ * You should not attempt to use it directly. */ -#ifndef _CPP_BITS_CHAR_TRAITS_H -#define _CPP_BITS_CHAR_TRAITS_H 1 +#ifndef _CHAR_TRAITS_H +#define _CHAR_TRAITS_H 1 #pragma GCC system_header @@ -181,7 +181,7 @@ namespace std }; -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T /// 21.1.3.2 char_traits specializations template<> struct char_traits<wchar_t> @@ -245,7 +245,7 @@ namespace std not_eof(const int_type& __c) { return eq_int_type(__c, eof()) ? 0 : __c; } }; -#endif //_GLIBCPP_USE_WCHAR_T +#endif //_GLIBCXX_USE_WCHAR_T template<typename _CharT, typename _Traits> struct _Char_traits_match diff --git a/libstdc++-v3/include/bits/codecvt.h b/libstdc++-v3/include/bits/codecvt.h index 45d5f3a..f013142 100644 --- a/libstdc++-v3/include/bits/codecvt.h +++ b/libstdc++-v3/include/bits/codecvt.h @@ -38,8 +38,8 @@ * You should not attempt to use it directly. */ -#ifndef _CPP_BITS_CODECVT_H -#define _CPP_BITS_CODECVT_H 1 +#ifndef _CODECVT_H +#define _CODECVT_H 1 #pragma GCC system_header @@ -271,7 +271,7 @@ do_max_length() const throw(); }; -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T // codecvt<wchar_t, char, mbstate_t> required specialization template<> class codecvt<wchar_t, char, mbstate_t> @@ -330,7 +330,7 @@ virtual int do_max_length() const throw(); }; -#endif //_GLIBCPP_USE_WCHAR_T +#endif //_GLIBCXX_USE_WCHAR_T // 22.2.1.6 Template class codecvt_byname template<typename _InternT, typename _ExternT, typename _StateT> @@ -353,8 +353,8 @@ // Include host and configuration specific partial specializations // with additional functionality, if possible. -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T #include <bits/codecvt_specializations.h> #endif -#endif // _CPP_BITS_CODECVT_H +#endif // _CODECVT_H diff --git a/libstdc++-v3/include/bits/concept_check.h b/libstdc++-v3/include/bits/concept_check.h index 88877eb..80c1439 100644 --- a/libstdc++-v3/include/bits/concept_check.h +++ b/libstdc++-v3/include/bits/concept_check.h @@ -32,8 +32,8 @@ * You should not attempt to use it directly. */ -#ifndef _GLIBCPP_CONCEPT_CHECK -#define _GLIBCPP_CONCEPT_CHECK 1 +#ifndef _CONCEPT_CHECK_H +#define _CONCEPT_CHECK_H 1 #pragma GCC system_header @@ -47,13 +47,13 @@ // Concept-checking code is off by default unless users turn it on via // configure options or editing c++config.h. -#ifndef _GLIBCPP_CONCEPT_CHECKS +#ifndef _GLIBCXX_CONCEPT_CHECKS -#define __glibcpp_function_requires(...) -#define __glibcpp_class_requires(_a,_b) -#define __glibcpp_class_requires2(_a,_b,_c) -#define __glibcpp_class_requires3(_a,_b,_c,_d) -#define __glibcpp_class_requires4(_a,_b,_c,_d,_e) +#define __glibcxx_function_requires(...) +#define __glibcxx_class_requires(_a,_b) +#define __glibcxx_class_requires2(_a,_b,_c) +#define __glibcxx_class_requires3(_a,_b,_c,_d) +#define __glibcxx_class_requires4(_a,_b,_c,_d,_e) #else // the checks are on @@ -61,7 +61,7 @@ // Note that the obvious and elegant approach of // -//#define glibcpp_function_requires(C) boost::function_requires< boost::C >() +//#define glibcxx_function_requires(C) boost::function_requires< boost::C >() // // won't work due to concept templates with more than one parameter, e.g., // BinaryPredicateConcept. The preprocessor tries to split things up on @@ -69,17 +69,17 @@ // parenthesis to hide the commas, because "boost::(Temp<Foo,Bar>)" isn't // a valid instantiation pattern. Thus, we steal a feature from C99. -#define __glibcpp_function_requires(...) \ +#define __glibcxx_function_requires(...) \ __gnu_cxx::__function_requires< __gnu_cxx::__VA_ARGS__ >(); -#define __glibcpp_class_requires(_a,_C) \ - _GLIBCPP_CLASS_REQUIRES(_a, __gnu_cxx, _C); -#define __glibcpp_class_requires2(_a,_b,_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); -#define __glibcpp_class_requires4(_a,_b,_c,_d,_C) \ - _GLIBCPP_CLASS_REQUIRES4(_a, _b, _c, _d, __gnu_cxx, _C); +#define __glibcxx_class_requires(_a,_C) \ + _GLIBCXX_CLASS_REQUIRES(_a, __gnu_cxx, _C); +#define __glibcxx_class_requires2(_a,_b,_C) \ + _GLIBCXX_CLASS_REQUIRES2(_a, _b, __gnu_cxx, _C); +#define __glibcxx_class_requires3(_a,_b,_c,_C) \ + _GLIBCXX_CLASS_REQUIRES3(_a, _b, _c, __gnu_cxx, _C); +#define __glibcxx_class_requires4(_a,_b,_c,_d,_C) \ + _GLIBCXX_CLASS_REQUIRES4(_a, _b, _c, _d, __gnu_cxx, _C); #endif // enable/disable -#endif // _GLIBCPP_CONCEPT_CHECK +#endif // _GLIBCXX_CONCEPT_CHECK diff --git a/libstdc++-v3/include/bits/cpp_type_traits.h b/libstdc++-v3/include/bits/cpp_type_traits.h index 4151502..00fe560 100644 --- a/libstdc++-v3/include/bits/cpp_type_traits.h +++ b/libstdc++-v3/include/bits/cpp_type_traits.h @@ -34,8 +34,8 @@ * You should not attempt to use it directly. */ -#ifndef _CPP_BITS_CPP_TYPE_TRAITS_H -#define _CPP_BITS_CPP_TYPE_TRAITS_H 1 +#ifndef _CPP_TYPE_TRAITS_H +#define _CPP_TYPE_TRAITS_H 1 #pragma GCC system_header @@ -167,7 +167,7 @@ namespace std }; }; -# ifdef _GLIBCPP_USE_WCHAR_T +# ifdef _GLIBCXX_USE_WCHAR_T template<> struct __is_integer<wchar_t> { @@ -329,4 +329,4 @@ namespace std } // namespace std -#endif //_CPP_BITS_CPP_TYPE_TRAITS_H +#endif //_CPP_TYPE_TRAITS_H diff --git a/libstdc++-v3/include/bits/demangle.h b/libstdc++-v3/include/bits/demangle.h index 41347a2..d6fdcd5 100644 --- a/libstdc++-v3/include/bits/demangle.h +++ b/libstdc++-v3/include/bits/demangle.h @@ -28,44 +28,44 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#ifndef __DEMANGLER_H -#define __DEMANGLER_H 1 +#ifndef _DEMANGLER_H +#define _DEMANGLER_H 1 #include <limits> #include <vector> #include <string> #include <cctype> -#ifndef _GLIBCPP_DEMANGLER_DEBUG -#define _GLIBCPP_DEMANGLER_CWDEBUG 0 -#define _GLIBCPP_DEMANGLER_DEBUG(x) -#define _GLIBCPP_DEMANGLER_DOUT(cntrl, data) -#define _GLIBCPP_DEMANGLER_DOUT_ENTERING(x) -#define _GLIBCPP_DEMANGLER_DOUT_ENTERING2(x) -#define _GLIBCPP_DEMANGLER_RETURN \ +#ifndef _GLIBCXX_DEMANGLER_DEBUG +#define _GLIBCXX_DEMANGLER_CWDEBUG 0 +#define _GLIBCXX_DEMANGLER_DEBUG(x) +#define _GLIBCXX_DEMANGLER_DOUT(cntrl, data) +#define _GLIBCXX_DEMANGLER_DOUT_ENTERING(x) +#define _GLIBCXX_DEMANGLER_DOUT_ENTERING2(x) +#define _GLIBCXX_DEMANGLER_RETURN \ return M_result -#define _GLIBCPP_DEMANGLER_RETURN2 \ +#define _GLIBCXX_DEMANGLER_RETURN2 \ return M_result -#define _GLIBCPP_DEMANGLER_FAILURE \ +#define _GLIBCXX_DEMANGLER_FAILURE \ do { M_result = false; return false; } while(0) #else -#define _GLIBCPP_DEMANGLER_CWDEBUG 1 +#define _GLIBCXX_DEMANGLER_CWDEBUG 1 #endif // The following defines change the behaviour of the demangler. The // default behaviour is that none of these macros is defined. -// _GLIBCPP_DEMANGLER_STYLE_VOID +// _GLIBCXX_DEMANGLER_STYLE_VOID // Default behaviour: int f() // Uses (void) instead of (): int f(void) -// _GLIBCPP_DEMANGLER_STYLE_LITERAL +// _GLIBCXX_DEMANGLER_STYLE_LITERAL // Default behaviour: (long)13, // (unsigned long long)19 // Use extensions 'u', 'l' and 'll' for integral // literals (as in template arguments): 13l, 19ull -// _GLIBCPP_DEMANGLER_STYLE_LITERAL_INT +// _GLIBCXX_DEMANGLER_STYLE_LITERAL_INT // Default behaviour: 4 // Use also an explicit cast for int in literals: (int)4 @@ -282,7 +282,7 @@ namespace __gnu_cxx std::vector<int, Allocator> M_template_arg_pos; int M_template_arg_pos_offset; std::vector<substitution_st, Allocator> M_substitutions_pos; -#if _GLIBCPP_DEMANGLER_CWDEBUG +#if _GLIBCXX_DEMANGLER_CWDEBUG bool M_inside_add_substitution; #endif @@ -294,7 +294,7 @@ namespace __gnu_cxx M_name_is_cdtor(false), M_name_is_template(false), M_name_is_conversion_operator(false), M_template_args_need_space(false), M_template_arg_pos_offset(0) -#if _GLIBCPP_DEMANGLER_CWDEBUG +#if _GLIBCXX_DEMANGLER_CWDEBUG , M_inside_add_substitution(false) #endif { } @@ -373,7 +373,7 @@ namespace __gnu_cxx }; template<typename Allocator> -#if !_GLIBCPP_DEMANGLER_CWDEBUG +#if !_GLIBCXX_DEMANGLER_CWDEBUG inline #endif void @@ -383,14 +383,14 @@ namespace __gnu_cxx { if (!M_inside_substitution) { -#if _GLIBCPP_DEMANGLER_CWDEBUG +#if _GLIBCXX_DEMANGLER_CWDEBUG if (M_inside_add_substitution) return; #endif M_substitutions_pos. push_back(substitution_st(start_pos, sub_type, number_of_prefixes)); -#if _GLIBCPP_DEMANGLER_CWDEBUG +#if _GLIBCXX_DEMANGLER_CWDEBUG if (!DEBUGCHANNELS::dc::demangler.is_on()) return; string_type substitution_name("S"); @@ -403,7 +403,7 @@ namespace __gnu_cxx int saved_pos = M_pos; M_pos = start_pos; M_inside_add_substitution = true; - _GLIBCPP_DEMANGLER_DEBUG( dc::demangler.off() ); + _GLIBCXX_DEMANGLER_DEBUG( dc::demangler.off() ); switch(sub_type) { case type: @@ -437,8 +437,8 @@ namespace __gnu_cxx break; } M_pos = saved_pos; - _GLIBCPP_DEMANGLER_DEBUG( dc::demangler.on() ); - _GLIBCPP_DEMANGLER_DOUT(dc::demangler, + _GLIBCXX_DEMANGLER_DEBUG( dc::demangler.on() ); + _GLIBCXX_DEMANGLER_DOUT(dc::demangler, "Adding substitution " << substitution_name << " : " << subst << " (from " << location_ct((char*)__builtin_return_address(0) @@ -487,7 +487,7 @@ namespace __gnu_cxx bool session<Allocator>::decode_number(string_type& output) { - _GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_number"); + _GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_number"); if (current() != 'n') decode_decimal_integer(output); else @@ -496,7 +496,7 @@ namespace __gnu_cxx eat_current(); decode_decimal_integer(output); } - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; } // <builtin-type> ::= v # void @@ -557,13 +557,13 @@ namespace __gnu_cxx bool session<Allocator>::decode_builtin_type(string_type& output) { - _GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_builtin_type"); + _GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_builtin_type"); char const* bt; if (!islower(current()) || !(bt = builtin_type_c[current() - 'a'])) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; output += bt; eat_current(); - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; } // <class-enum-type> ::= <name> @@ -572,12 +572,12 @@ namespace __gnu_cxx bool session<Allocator>::decode_class_enum_type(string_type& output) { - _GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_class_enum_type"); + _GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_class_enum_type"); string_type nested_name_qualifiers; if (!decode_name(output, nested_name_qualifiers)) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; output += nested_name_qualifiers; - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; } // <substitution> ::= @@ -601,7 +601,7 @@ namespace __gnu_cxx session<Allocator>::decode_substitution(string_type& output, qualifier_list<Allocator>* qualifiers) { - _GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_substitution"); + _GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_substitution"); unsigned int value = 0; char c = next(); if (c != '_') @@ -621,7 +621,7 @@ namespace __gnu_cxx eat_current(); if (qualifiers) qualifiers->printing_suppressed(); - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; } case 'b': { @@ -636,7 +636,7 @@ namespace __gnu_cxx eat_current(); if (qualifiers) qualifiers->printing_suppressed(); - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; } case 'd': output += "std::iostream"; @@ -650,7 +650,7 @@ namespace __gnu_cxx eat_current(); if (qualifiers) qualifiers->printing_suppressed(); - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; case 'i': output += "std::istream"; if (!M_inside_template_args) @@ -663,7 +663,7 @@ namespace __gnu_cxx eat_current(); if (qualifiers) qualifiers->printing_suppressed(); - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; case 'o': output += "std::ostream"; if (!M_inside_template_args) @@ -676,7 +676,7 @@ namespace __gnu_cxx eat_current(); if (qualifiers) qualifiers->printing_suppressed(); - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; case 's': output += "std::string"; if (!M_inside_template_args) @@ -689,13 +689,13 @@ namespace __gnu_cxx eat_current(); if (qualifiers) qualifiers->printing_suppressed(); - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; case 't': output += "std"; eat_current(); if (qualifiers) qualifiers->printing_suppressed(); - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; default: for(;; c = next()) { @@ -706,7 +706,7 @@ namespace __gnu_cxx else if (c == '_') break; else - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; } ++value; break; @@ -715,7 +715,7 @@ namespace __gnu_cxx eat_current(); if (value >= M_substitutions_pos.size() || M_inside_type > 20) // Rather than core dump. - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; ++M_inside_substitution; int saved_pos = M_pos; substitution_st& substitution(M_substitutions_pos[value]); @@ -738,7 +738,7 @@ namespace __gnu_cxx output += ' '; M_template_args_need_space = false; if (!decode_template_args(output)) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; } else { @@ -747,10 +747,10 @@ namespace __gnu_cxx if (current() == 'S') { if (!decode_substitution(output)) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; } else if (!decode_unqualified_name(output)) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; } } if (qualifiers) @@ -764,7 +764,7 @@ namespace __gnu_cxx } M_pos = saved_pos; --M_inside_substitution; - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; } // <template-param> ::= T_ # first template parameter @@ -775,9 +775,9 @@ namespace __gnu_cxx session<Allocator>::decode_template_param(string_type& output, qualifier_list<Allocator>* qualifiers) { - _GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_template_parameter"); + _GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_template_parameter"); if (current() != 'T') - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; unsigned int value = 0; char c; if ((c = next()) != '_') @@ -790,14 +790,14 @@ namespace __gnu_cxx ++value; } if (eat_current() != '_') - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; value += M_template_arg_pos_offset; if (value >= M_template_arg_pos.size()) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; int saved_pos = M_pos; M_pos = M_template_arg_pos[value]; if (M_inside_type > 20) // Rather than core dump. - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; ++M_inside_substitution; if (current() == 'X') { @@ -810,23 +810,23 @@ namespace __gnu_cxx decode_type(output, qualifiers); --M_inside_substitution; M_pos = saved_pos; - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; } template<typename Allocator> bool session<Allocator>::decode_literal(string_type& output) { - _GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_literal"); + _GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_literal"); eat_current(); // Eat the 'L'. if (current() == '_') { if (next() != 'Z') - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; eat_current(); if ((M_pos += decode_encoding(output, M_str + M_pos, M_maxpos - M_pos + 1)) < 0) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; } else { @@ -838,16 +838,16 @@ namespace __gnu_cxx else output += "true"; eat_current(); - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; } char c = current(); -#ifdef _GLIBCPP_DEMANGLER_STYLE_LITERAL +#ifdef _GLIBCXX_DEMANGLER_STYLE_LITERAL if (c == 'i' || c == 'j' || c == 'l' || c == 'm' || c == 'x' || c == 'y') eat_current(); else #else -#ifndef _GLIBCPP_DEMANGLER_STYLE_LITERAL_INT +#ifndef _GLIBCXX_DEMANGLER_STYLE_LITERAL_INT if (c == 'i') eat_current(); else @@ -856,12 +856,12 @@ namespace __gnu_cxx { output += '('; if (!decode_type(output)) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; output += ')'; } if (!decode_number(output)) - _GLIBCPP_DEMANGLER_FAILURE; -#ifdef _GLIBCPP_DEMANGLER_STYLE_LITERAL + _GLIBCXX_DEMANGLER_FAILURE; +#ifdef _GLIBCXX_DEMANGLER_STYLE_LITERAL if (c == 'j' || c == 'm' || c == 'y') output += 'u'; if (c == 'l' || c == 'm') @@ -870,7 +870,7 @@ namespace __gnu_cxx output += "ll"; #endif } - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; } // <operator-name> ::= @@ -1040,7 +1040,7 @@ namespace __gnu_cxx bool session<Allocator>::decode_operator_name(string_type& output) { - _GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_operator_name"); + _GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_operator_name"); char opcode0 = current(); char opcode1 = tolower(next()); @@ -1066,7 +1066,7 @@ namespace __gnu_cxx eat_current(); if (hash == 27 || hash == 28) M_template_args_need_space = true; - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; } else if (opcode0 == 'c' && opcode1 == 'v') { @@ -1082,14 +1082,14 @@ namespace __gnu_cxx M_template_arg_pos.push_back(M_pos + 3); } if (!decode_type(output)) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; if (!M_inside_template_args) M_name_is_conversion_operator = true; - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; } } } - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; } // @@ -1105,21 +1105,21 @@ namespace __gnu_cxx bool session<Allocator>::decode_expression(string_type& output) { - _GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_expression"); + _GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_expression"); if (current() == 'T') { if (!decode_template_param(output)) - _GLIBCPP_DEMANGLER_FAILURE; - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_RETURN; } else if (current() == 'L') { if (!decode_literal(output)) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; if (current() != 'E') - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; eat_current(); - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; } else { @@ -1152,7 +1152,7 @@ namespace __gnu_cxx eat_current(); output += '('; if (!decode_expression(output)) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; output += ')'; if (!entry.unary) { @@ -1163,15 +1163,15 @@ namespace __gnu_cxx output += ' '; output += '('; if (!decode_expression(output)) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; output += ')'; } - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; } } } } - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; } // @@ -1184,9 +1184,9 @@ namespace __gnu_cxx bool session<Allocator>::decode_template_args(string_type& output) { - _GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_template_args"); + _GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_template_args"); if (eat_current() != 'I') - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; int prev_size = M_template_arg_pos.size(); ++M_inside_template_args; if (M_template_args_need_space) @@ -1203,21 +1203,21 @@ namespace __gnu_cxx { eat_current(); if (!decode_expression(output)) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; if (current() != 'E') - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; eat_current(); } else if (current() == 'L') { if (!decode_literal(output)) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; if (current() != 'E') - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; eat_current(); } else if (!decode_type(output)) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; if (current() == 'E') break; output += ", "; @@ -1232,7 +1232,7 @@ namespace __gnu_cxx M_name_is_template = true; M_template_arg_pos_offset = prev_size; } - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; } // <bare-function-type> ::= @@ -1242,38 +1242,38 @@ namespace __gnu_cxx bool session<Allocator>::decode_bare_function_type(string_type& output) { - _GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_bare_function_type"); + _GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_bare_function_type"); if (M_saw_destructor) { if (eat_current() != 'v' || (current() != 'E' && current() != 0)) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; output += "()"; M_saw_destructor = false; - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; } -#ifndef _GLIBCPP_DEMANGLER_STYLE_VOID +#ifndef _GLIBCXX_DEMANGLER_STYLE_VOID if (current() == 'v') { eat_current(); if (current() != 'E' && current() != 0) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; output += "()"; M_saw_destructor = false; - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; } #endif output += '('; M_template_args_need_space = false; if (!decode_type(output)) // Must have at least one parameter. - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; while (current() != 'E' && current() != 0) { output += ", "; if (!decode_type(output)) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; } output += ')'; - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; } // <type> ::= @@ -1445,7 +1445,7 @@ namespace __gnu_cxx string_type& prefix, string_type& postfix, qualifier_list<Allocator>* qualifiers) { - _GLIBCPP_DEMANGLER_DOUT_ENTERING2 + _GLIBCXX_DEMANGLER_DOUT_ENTERING2 (qualifiers ? "decode_type" : "decode_type[with qualifiers]"); ++M_inside_type; bool recursive_template_param_or_substitution_call; @@ -1768,8 +1768,8 @@ namespace __gnu_cxx if (!recursive_template_param_or_substitution_call) delete qualifiers; if (failure) - _GLIBCPP_DEMANGLER_FAILURE; - _GLIBCPP_DEMANGLER_RETURN2; + _GLIBCXX_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_RETURN2; } // <nested-name> ::= N [<CV-qualifiers>] <prefix> <unqualified-name> E @@ -1788,10 +1788,10 @@ namespace __gnu_cxx session<Allocator>::decode_nested_name(string_type& output, string_type& qualifiers) { - _GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_nested_name"); + _GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_nested_name"); if (current() != 'N' || M_pos >= M_maxpos) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; // <CV-qualifiers> ::= [r] [V] [K] # restrict (C99), volatile, const char const* qualifiers_start = &M_str[M_pos + 1]; @@ -1819,12 +1819,12 @@ namespace __gnu_cxx if (current() == 'S') { if (!decode_substitution(output)) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; } else if (current() == 'I') { if (!decode_template_args(output)) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; if (current() != 'E') { // substitution: "<template-prefix> <template-args>". @@ -1835,7 +1835,7 @@ namespace __gnu_cxx else { if (!decode_unqualified_name(output)) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; if (current() != 'E') { // substitution: "<prefix> <unqualified-name>" or @@ -1849,7 +1849,7 @@ namespace __gnu_cxx if (current() == 'E') { eat_current(); - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; } if (current() != 'I') output += "::"; @@ -1857,7 +1857,7 @@ namespace __gnu_cxx output += ' '; M_template_args_need_space = false; } - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; } // <local-name> := Z <function encoding> E <entity name> [<discriminator>] @@ -1868,12 +1868,12 @@ namespace __gnu_cxx bool session<Allocator>::decode_local_name(string_type& output) { - _GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_local_name"); + _GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_local_name"); if (current() != 'Z' || M_pos >= M_maxpos) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; if ((M_pos += decode_encoding(output, M_str + M_pos + 1, M_maxpos - M_pos) + 1) < 0 || eat_current() != 'E') - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; output += "::"; if (current() == 's') { @@ -1884,13 +1884,13 @@ namespace __gnu_cxx { string_type nested_name_qualifiers; if (!decode_name(output, nested_name_qualifiers)) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; output += nested_name_qualifiers; } string_type discriminator; if (current() == '_' && next() != 'n' && !decode_number(discriminator)) - _GLIBCPP_DEMANGLER_FAILURE; - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_RETURN; } // <source-name> ::= <positive length number> <identifier> @@ -1899,10 +1899,10 @@ namespace __gnu_cxx bool session<Allocator>::decode_source_name(string_type& output) { - _GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_source_name"); + _GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_source_name"); int length = current() - '0'; if (length < 1 || length > 9) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; while(std::isdigit(next())) length = 10 * length + current() - '0'; char const* ptr = &M_str[M_pos]; @@ -1911,16 +1911,16 @@ namespace __gnu_cxx { output += "(anonymous namespace)"; if ((M_pos += length) > M_maxpos + 1) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; } else while(length--) { if (current() == 0) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; output += eat_current(); } - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; } // <unqualified-name> ::= <operator-name> # Starts with lower case. @@ -1931,7 +1931,7 @@ namespace __gnu_cxx bool session<Allocator>::decode_unqualified_name(string_type& output) { - _GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_unqualified_name"); + _GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_unqualified_name"); if (std::isdigit(current())) { if (!M_inside_template_args) @@ -1948,13 +1948,13 @@ namespace __gnu_cxx M_name_is_cdtor = false; M_name_is_conversion_operator = false; if (!decode_source_name(M_function_name)) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; if (!recursive_unqualified_name) output += M_function_name; } else if (!decode_source_name(output)) - _GLIBCPP_DEMANGLER_FAILURE; - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_RETURN; } if (islower(current())) { @@ -1965,15 +1965,15 @@ namespace __gnu_cxx M_name_is_cdtor = false; M_name_is_conversion_operator = false; if (!decode_operator_name(M_function_name)) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; output += M_function_name; } - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; } if (current() == 'C' || current() == 'D') { if (M_inside_template_args) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; // <ctor-dtor-name> ::= // C1 # complete object (in-charge) constructor // C2 # base object (not-in-charge) constructor @@ -1986,22 +1986,22 @@ namespace __gnu_cxx { char c = next(); if (c < '1' || c > '3') - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; } else { char c = next(); if (c < '0' || c > '2') - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; output += '~'; M_saw_destructor = true; } M_name_is_cdtor = true; eat_current(); output += M_function_name; - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; } - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; } // <unscoped-name> ::= @@ -2012,16 +2012,16 @@ namespace __gnu_cxx bool session<Allocator>::decode_unscoped_name(string_type& output) { - _GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_unscoped_name"); + _GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_unscoped_name"); if (current() == 'S') { if (next() != 't') - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; eat_current(); output += "std::"; } decode_unqualified_name(output); - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; } // <name> ::= @@ -2039,34 +2039,34 @@ namespace __gnu_cxx session<Allocator>::decode_name(string_type& output, string_type& nested_name_qualifiers) { - _GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_name"); + _GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_name"); int substitution_start = M_pos; if (current() == 'S' && (M_pos >= M_maxpos || M_str[M_pos + 1] != 't')) { if (!decode_substitution(output)) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; } else if (current() == 'N') { decode_nested_name(output, nested_name_qualifiers); - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; } else if (current() == 'Z') { decode_local_name(output); - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; } else if (!decode_unscoped_name(output)) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; if (current() == 'I') { // Must have been an <unscoped-template-name>. add_substitution(substitution_start, unscoped_template_name); if (!decode_template_args(output)) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; } M_template_args_need_space = false; - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; } // <call-offset> ::= h <nv-offset> _ @@ -2079,12 +2079,12 @@ namespace __gnu_cxx template<typename Allocator> bool session<Allocator>::decode_call_offset(string_type& -#if _GLIBCPP_DEMANGLER_CWDEBUG +#if _GLIBCXX_DEMANGLER_CWDEBUG output #endif ) { - _GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_call_offset"); + _GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_call_offset"); if (current() == 'h') { string_type dummy; @@ -2092,7 +2092,7 @@ namespace __gnu_cxx if (decode_number(dummy) && current() == '_') { eat_current(); - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; } } else if (current() == 'v') @@ -2105,11 +2105,11 @@ namespace __gnu_cxx if (decode_number(dummy) && current() == '_') { eat_current(); - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; } } } - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; } // @@ -2135,67 +2135,67 @@ namespace __gnu_cxx bool session<Allocator>::decode_special_name(string_type& output) { - _GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_special_name"); + _GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_special_name"); if (current() == 'G') { if (next() != 'V') - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; output += "guard variable for "; string_type nested_name_qualifiers; eat_current(); if (!decode_name(output, nested_name_qualifiers)) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; output += nested_name_qualifiers; - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; } else if (current() != 'T') - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; switch(next()) { case 'V': output += "vtable for "; eat_current(); decode_type(output); - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; case 'T': output += "VTT for "; eat_current(); decode_type(output); - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; case 'I': output += "typeinfo for "; eat_current(); decode_type(output); - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; case 'S': output += "typeinfo name for "; eat_current(); decode_type(output); - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; case 'c': output += "covariant return thunk to "; if (!decode_call_offset(output) || !decode_call_offset(output) || (M_pos += decode_encoding(output, M_str + M_pos, M_maxpos - M_pos + 1)) < 0) - _GLIBCPP_DEMANGLER_FAILURE; - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_RETURN; case 'C': // GNU extension? { string_type first; output += "construction vtable for "; eat_current(); if (!decode_type(first)) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; while(std::isdigit(current())) eat_current(); if (eat_current() != '_') - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; if (!decode_type(output)) - _GLIBCPP_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_FAILURE; output += "-in-"; output += first; - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_RETURN; } default: if (current() == 'v') @@ -2205,8 +2205,8 @@ namespace __gnu_cxx if (!decode_call_offset(output) || (M_pos += decode_encoding(output, M_str + M_pos, M_maxpos - M_pos + 1)) < 0) - _GLIBCPP_DEMANGLER_FAILURE; - _GLIBCPP_DEMANGLER_RETURN; + _GLIBCXX_DEMANGLER_FAILURE; + _GLIBCXX_DEMANGLER_RETURN; } } @@ -2222,11 +2222,11 @@ namespace __gnu_cxx char const* in, int len) { -#if _GLIBCPP_DEMANGLER_CWDEBUG - _GLIBCPP_DEMANGLER_DOUT(dc::demangler, +#if _GLIBCXX_DEMANGLER_CWDEBUG + _GLIBCXX_DEMANGLER_DOUT(dc::demangler, "Output thus far: \"" << output << '"'); string_type input(in, len > 0x40000000 ? strlen(in) : len); - _GLIBCPP_DEMANGLER_DOUT( + _GLIBCXX_DEMANGLER_DOUT( dc::demangler, "Entering decode_encoding(\"" << input << "\")"); #endif if (len <= 0) diff --git a/libstdc++-v3/include/bits/deque.tcc b/libstdc++-v3/include/bits/deque.tcc index 43be956..8164df5 100644 --- a/libstdc++-v3/include/bits/deque.tcc +++ b/libstdc++-v3/include/bits/deque.tcc @@ -58,8 +58,8 @@ * You should not attempt to use it directly. */ -#ifndef __GLIBCPP_INTERNAL_DEQUE_TCC -#define __GLIBCPP_INTERNAL_DEQUE_TCC +#ifndef _DEQUE_TCC +#define _DEQUE_TCC 1 namespace std { @@ -709,4 +709,4 @@ namespace std } } // namespace std -#endif /* __GLIBCPP_INTERNAL_DEQUE_TCC */ +#endif diff --git a/libstdc++-v3/include/bits/fstream.tcc b/libstdc++-v3/include/bits/fstream.tcc index fddfd63..c25d501 100644 --- a/libstdc++-v3/include/bits/fstream.tcc +++ b/libstdc++-v3/include/bits/fstream.tcc @@ -32,8 +32,8 @@ // ISO C++ 14882: 27.8 File-based streams // -#ifndef _CPP_BITS_FSTREAM_TCC -#define _CPP_BITS_FSTREAM_TCC 1 +#ifndef _FSTREAM_TCC +#define _FSTREAM_TCC 1 #pragma GCC system_header @@ -519,7 +519,7 @@ namespace std basic_filebuf<_CharT, _Traits>:: seekpos(pos_type __pos, ios_base::openmode __mode) { -#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS +#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS // 171. Strange seekpos() semantics due to joint position pos_type __ret = pos_type(off_type(-1)); @@ -567,13 +567,13 @@ namespace std // Inhibit implicit instantiations for required instantiations, // which are defined via explicit instantiations elsewhere. // NB: This syntax is a GNU extension. -#if _GLIBCPP_EXTERN_TEMPLATE +#if _GLIBCXX_EXTERN_TEMPLATE extern template class basic_filebuf<char>; extern template class basic_ifstream<char>; extern template class basic_ofstream<char>; extern template class basic_fstream<char>; -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T extern template class basic_filebuf<wchar_t>; extern template class basic_ifstream<wchar_t>; extern template class basic_ofstream<wchar_t>; diff --git a/libstdc++-v3/include/bits/gslice.h b/libstdc++-v3/include/bits/gslice.h index 95781f9..c546028 100644 --- a/libstdc++-v3/include/bits/gslice.h +++ b/libstdc++-v3/include/bits/gslice.h @@ -34,8 +34,8 @@ * You should not attempt to use it directly. */ -#ifndef _CPP_BITS_GSLICE_H -#define _CPP_BITS_GSLICE_H 1 +#ifndef _GSLICE_H +#define _GSLICE_H 1 #pragma GCC system_header @@ -117,7 +117,7 @@ namespace std { } // std:: -#endif /* _CPP_BITS_GSLICE_H */ +#endif /* _GSLICE_H */ // Local Variables: // mode:c++ diff --git a/libstdc++-v3/include/bits/gslice_array.h b/libstdc++-v3/include/bits/gslice_array.h index 22b59d1..508eb7c 100644 --- a/libstdc++-v3/include/bits/gslice_array.h +++ b/libstdc++-v3/include/bits/gslice_array.h @@ -34,8 +34,8 @@ * You should not attempt to use it directly. */ -#ifndef _CPP_BITS_GSLICE_ARRAY -#define _CPP_BITS_GSLICE_ARRAY 1 +#ifndef _GSLICE_ARRAY_H +#define _GSLICE_ARRAY_H 1 #pragma GCC system_header @@ -171,7 +171,7 @@ _DEFINE_VALARRAY_OPERATOR(>>, __shift_right) } // std:: -#endif /* _CPP_BITS_GSLICE_ARRAY */ +#endif /* _GSLICE_ARRAY_H */ // Local Variables: // mode:c++ diff --git a/libstdc++-v3/include/bits/indirect_array.h b/libstdc++-v3/include/bits/indirect_array.h index d88cc25..cb81aab 100644 --- a/libstdc++-v3/include/bits/indirect_array.h +++ b/libstdc++-v3/include/bits/indirect_array.h @@ -35,8 +35,8 @@ * You should not attempt to use it directly. */ -#ifndef _CPP_BITS_INDIRECT_ARRAY_H -#define _CPP_BITS_INDIRECT_ARRAY_H 1 +#ifndef _INDIRECT_ARRAY_H +#define _INDIRECT_ARRAY_H 1 #pragma GCC system_header @@ -171,7 +171,7 @@ _DEFINE_VALARRAY_OPERATOR(>>, __shift_right) } // std:: -#endif /* _CPP_BITS_INDIRECT_ARRAY_H */ +#endif /* _INDIRECT_ARRAY_H */ // Local Variables: // mode:c++ diff --git a/libstdc++-v3/include/bits/ios_base.h b/libstdc++-v3/include/bits/ios_base.h index ef2f57a..34600cc 100644 --- a/libstdc++-v3/include/bits/ios_base.h +++ b/libstdc++-v3/include/bits/ios_base.h @@ -37,8 +37,8 @@ * You should not attempt to use it directly. */ -#ifndef _CPP_BITS_IOSBASE_H -#define _CPP_BITS_IOSBASE_H 1 +#ifndef _IOS_BASE_H +#define _IOS_BASE_H 1 #pragma GCC system_header @@ -164,7 +164,7 @@ namespace std class failure : public exception { public: -#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS +#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS //48. Use of non-existent exception constructor explicit failure(const string& __str) throw(); @@ -359,7 +359,7 @@ namespace std /// Request a seek relative to the current end of the sequence. static const seekdir end = seekdir(SEEK_END); -#ifdef _GLIBCPP_DEPRECATED +#ifdef _GLIBCXX_DEPRECATED // Annex D.6 typedef int io_state; typedef int open_mode; @@ -687,7 +687,7 @@ namespace std protected: ios_base(); -#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS +#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS //50. Copy constructor and assignment operator of ios_base private: ios_base(const ios_base&); @@ -879,5 +879,5 @@ namespace std } // namespace std -#endif /* _CPP_BITS_IOSBASE_H */ +#endif /* _IOS_BASE_H */ diff --git a/libstdc++-v3/include/bits/istream.tcc b/libstdc++-v3/include/bits/istream.tcc index eaeb414..7f26f64 100644 --- a/libstdc++-v3/include/bits/istream.tcc +++ b/libstdc++-v3/include/bits/istream.tcc @@ -32,6 +32,9 @@ // ISO C++ 14882: 27.6.2 Output streams // +#ifndef _ISTREAM_TCC +#define _ISTREAM_TCC 1 + #pragma GCC system_header #include <locale> @@ -59,7 +62,7 @@ namespace std traits_type::to_char_type(__c))) __c = __sb->snextc(); -#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS +#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS //195. Should basic_istream::sentry's constructor ever set eofbit? if (traits_type::eq_int_type(__c, __eof)) __in.setstate(ios_base::eofbit); @@ -142,7 +145,7 @@ namespace std ios_base::iostate __err = ios_base::iostate(ios_base::goodbit); long __l; __check_facet(this->_M_num_get).get(*this, 0, *this, __err, __l); -#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS +#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS // 118. basic_istream uses nonexistent num_get member functions. if (!(__err & ios_base::failbit) && (numeric_limits<short>::min() <= __l @@ -204,7 +207,7 @@ namespace std ios_base::iostate __err = ios_base::iostate(ios_base::goodbit); long __l; __check_facet(this->_M_num_get).get(*this, 0, *this, __err, __l); -#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS +#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS // 118. basic_istream uses nonexistent num_get member functions. if (!(__err & ios_base::failbit) && (numeric_limits<int>::min() <= __l @@ -305,7 +308,7 @@ namespace std return *this; } -#ifdef _GLIBCPP_USE_LONG_LONG +#ifdef _GLIBCXX_USE_LONG_LONG template<typename _CharT, typename _Traits> basic_istream<_CharT, _Traits>& basic_istream<_CharT, _Traits>:: @@ -828,7 +831,7 @@ namespace std basic_istream<_CharT, _Traits>:: putback(char_type __c) { -#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS +#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS // 60. What is a formatted input function? _M_gcount = 0; #endif @@ -862,7 +865,7 @@ namespace std basic_istream<_CharT, _Traits>:: unget(void) { -#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS +#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS // 60. What is a formatted input function? _M_gcount = 0; #endif @@ -945,7 +948,7 @@ namespace std // DR60. Do not change _M_gcount. if (!this->fail()) { -#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS +#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS // 136. seekp, seekg setting wrong streams? pos_type __err = this->rdbuf()->pubseekpos(__pos, ios_base::in); @@ -965,7 +968,7 @@ namespace std // DR60. Do not change _M_gcount. if (!this->fail()) { -#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS +#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS // 136. seekp, seekg setting wrong streams? pos_type __err = this->rdbuf()->pubseekoff(__off, __dir, ios_base::in); @@ -1040,7 +1043,7 @@ namespace std if (_Traits::eq_int_type(__c, __eof)) __in.setstate(ios_base::eofbit); -#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS +#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS //68. Extractors for char* should store null at end *__s = char_type(); #endif @@ -1124,7 +1127,7 @@ namespace std __in.setstate(ios_base::eofbit); __in.width(0); } -#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS +#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS //211. operator>>(istream&, string&) doesn't set failbit if (!__extracted) __in.setstate (ios_base::failbit); @@ -1184,7 +1187,7 @@ namespace std // Inhibit implicit instantiations for required instantiations, // which are defined via explicit instantiations elsewhere. // NB: This syntax is a GNU extension. -#if _GLIBCPP_EXTERN_TEMPLATE +#if _GLIBCXX_EXTERN_TEMPLATE extern template class basic_istream<char>; extern template istream& ws(istream&); extern template istream& operator>>(istream&, char&); @@ -1194,7 +1197,7 @@ namespace std extern template istream& operator>>(istream&, unsigned char*); extern template istream& operator>>(istream&, signed char*); -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T extern template class basic_istream<wchar_t>; extern template wistream& ws(wistream&); extern template wistream& operator>>(wistream&, wchar_t&); @@ -1202,3 +1205,5 @@ namespace std #endif #endif } // namespace std + +#endif diff --git a/libstdc++-v3/include/bits/list.tcc b/libstdc++-v3/include/bits/list.tcc index d6cccb7..428dc90 100644 --- a/libstdc++-v3/include/bits/list.tcc +++ b/libstdc++-v3/include/bits/list.tcc @@ -58,8 +58,8 @@ * You should not attempt to use it directly. */ -#ifndef __GLIBCPP_INTERNAL_LIST_TCC -#define __GLIBCPP_INTERNAL_LIST_TCC +#ifndef _LIST_TCC +#define _LIST_TCC 1 namespace std { @@ -367,4 +367,4 @@ namespace std } } // namespace std -#endif /* __GLIBCPP_INTERNAL_LIST_TCC */ +#endif /* _LIST_TCC */ diff --git a/libstdc++-v3/include/bits/locale_classes.h b/libstdc++-v3/include/bits/locale_classes.h index cfc1149..7949aa4 100644 --- a/libstdc++-v3/include/bits/locale_classes.h +++ b/libstdc++-v3/include/bits/locale_classes.h @@ -37,8 +37,8 @@ * You should not attempt to use it directly. */ -#ifndef _CPP_BITS_LOCALE_CLASSES_H -#define _CPP_BITS_LOCALE_CLASSES_H 1 +#ifndef _LOCALE_CLASSES_H +#define _LOCALE_CLASSES_H 1 #pragma GCC system_header @@ -161,7 +161,7 @@ namespace std // macros. For GNU systems, the following are also valid: // LC_PAPER, LC_NAME, LC_ADDRESS, LC_TELEPHONE, LC_MEASUREMENT, // and LC_IDENTIFICATION. - static const size_t _S_categories_size = 6 + _GLIBCPP_NUM_CATEGORIES; + static const size_t _S_categories_size = 6 + _GLIBCXX_NUM_CATEGORIES; explicit locale(_Impl*) throw(); diff --git a/libstdc++-v3/include/bits/locale_facets.h b/libstdc++-v3/include/bits/locale_facets.h index 72141f19..312d1d4 100644 --- a/libstdc++-v3/include/bits/locale_facets.h +++ b/libstdc++-v3/include/bits/locale_facets.h @@ -37,8 +37,8 @@ * You should not attempt to use it directly. */ -#ifndef _CPP_BITS_LOCFACETS_H -#define _CPP_BITS_LOCFACETS_H 1 +#ifndef _LOCALE_FACETS_H +#define _LOCALE_FACETS_H 1 #pragma GCC system_header @@ -51,10 +51,10 @@ namespace std { // NB: Don't instantiate required wchar_t facets if no wchar_t support. -#ifdef _GLIBCPP_USE_WCHAR_T -# define _GLIBCPP_NUM_FACETS 28 +#ifdef _GLIBCXX_USE_WCHAR_T +# define _GLIBCXX_NUM_FACETS 28 #else -# define _GLIBCPP_NUM_FACETS 14 +# define _GLIBCXX_NUM_FACETS 14 #endif // Convert string to numeric value of type _Tv and store results. @@ -76,7 +76,7 @@ namespace std __convert_to_v(const char*, unsigned long&, ios_base::iostate&, const __c_locale&, int); -#ifdef _GLIBCPP_USE_LONG_LONG +#ifdef _GLIBCXX_USE_LONG_LONG template<> void __convert_to_v(const char*, long long&, ios_base::iostate&, @@ -425,7 +425,7 @@ namespace std const ctype<char>& use_facet<ctype<char> >(const locale& __loc); -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T // 22.2.1.3 ctype<wchar_t> specialization template<> class ctype<wchar_t> : public __ctype_abstract_base<wchar_t> @@ -498,7 +498,7 @@ namespace std template<> const ctype<wchar_t>& use_facet<ctype<wchar_t> >(const locale& __loc); -#endif //_GLIBCPP_USE_WCHAR_T +#endif //_GLIBCXX_USE_WCHAR_T // Include host and configuration specific ctype inlines. #include <bits/ctype_inline.h> @@ -753,7 +753,7 @@ namespace std void numpunct<char>::_M_initialize_numpunct(__c_locale __cloc); -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T template<> numpunct<wchar_t>::~numpunct(); @@ -824,7 +824,7 @@ namespace std ios_base::iostate& __err, unsigned long& __v) const { return this->do_get(__in, __end, __io, __err, __v); } -#ifdef _GLIBCPP_USE_LONG_LONG +#ifdef _GLIBCXX_USE_LONG_LONG iter_type get(iter_type __in, iter_type __end, ios_base& __io, ios_base::iostate& __err, long long& __v) const @@ -886,7 +886,7 @@ namespace std do_get(iter_type, iter_type, ios_base&, ios_base::iostate& __err, unsigned long&) const; -#ifdef _GLIBCPP_USE_LONG_LONG +#ifdef _GLIBCXX_USE_LONG_LONG virtual iter_type do_get(iter_type, iter_type, ios_base&, ios_base::iostate& __err, long long&) const; @@ -958,7 +958,7 @@ namespace std unsigned long __v) const { return this->do_put(__s, __f, __fill, __v); } -#ifdef _GLIBCPP_USE_LONG_LONG +#ifdef _GLIBCXX_USE_LONG_LONG iter_type put(iter_type __s, ios_base& __f, char_type __fill, long long __v) const { return this->do_put(__s, __f, __fill, __v); } @@ -1020,7 +1020,7 @@ namespace std virtual iter_type do_put(iter_type, ios_base&, char_type __fill, unsigned long) const; -#ifdef _GLIBCPP_USE_LONG_LONG +#ifdef _GLIBCXX_USE_LONG_LONG virtual iter_type do_put(iter_type, ios_base&, char_type __fill, long long __v) const; @@ -1116,7 +1116,7 @@ namespace std size_t collate<char>::_M_transform(char*, const char*, size_t) const; -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T template<> int collate<wchar_t>::_M_compare(const wchar_t*, const wchar_t*) const; @@ -1350,7 +1350,7 @@ namespace std void __timepunct<char>::_M_put(char*, size_t, const char*, const tm*) const; -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T template<> const wchar_t* __timepunct<wchar_t>::_S_timezones[14]; @@ -1687,7 +1687,7 @@ namespace std void moneypunct<char, false>::_M_initialize_moneypunct(__c_locale, const char*); -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T template<> moneypunct<wchar_t, true>::~moneypunct(); @@ -1928,7 +1928,7 @@ namespace std string messages<char>::do_get(catalog, int, int, const string&) const; -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T template<> wstring messages<wchar_t>::do_get(catalog, int, int, const wstring&) const; diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc index 9026a3e..518f41a 100644 --- a/libstdc++-v3/include/bits/locale_facets.tcc +++ b/libstdc++-v3/include/bits/locale_facets.tcc @@ -30,8 +30,8 @@ // Warning: this file is not meant for user inclusion. Use <locale>. -#ifndef _CPP_BITS_LOCFACETS_TCC -#define _CPP_BITS_LOCFACETS_TCC 1 +#ifndef _LOCALE_FACETS_TCC +#define _LOCALE_FACETS_TCC 1 #pragma GCC system_header @@ -96,7 +96,7 @@ namespace std const __numpunct_cache<char>& __use_cache(const locale& __loc); -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T template<> const __numpunct_cache<wchar_t>& __use_cache(const locale& __loc); @@ -391,7 +391,7 @@ namespace std return __beg; } -#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS +#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS //17. Bad bool parsing template<typename _CharT, typename _InIter> _InIter @@ -525,7 +525,7 @@ namespace std return __beg; } -#ifdef _GLIBCPP_USE_LONG_LONG +#ifdef _GLIBCXX_USE_LONG_LONG template<typename _CharT, typename _InIter> _InIter num_get<_CharT, _InIter>:: @@ -658,7 +658,7 @@ namespace std const _CharT* __lit, ios_base::fmtflags __flags) { return __int_to_char(__out, __size, __v, __lit, __flags, false); } -#ifdef _GLIBCPP_USE_LONG_LONG +#ifdef _GLIBCXX_USE_LONG_LONG template<typename _CharT> inline int __int_to_char(_CharT* __out, const int __size, long long __v, @@ -835,7 +835,7 @@ namespace std _M_group_float(const string& __grouping, _CharT __sep, const _CharT* __p, _CharT* __new, _CharT* __cs, int& __len) const { -#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS +#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS //282. What types does numpunct grouping refer to? // Add grouping, if necessary. _CharT* __p2; @@ -857,7 +857,7 @@ namespace std } // The following code uses snprintf (or sprintf(), when - // _GLIBCPP_USE_C99 is not defined) to convert floating point values + // _GLIBCXX_USE_C99 is not defined) to convert floating point values // for insertion into a stream. An optimization would be to replace // them with code that works directly on a wide buffer and then use // __pad to do the padding. It would be good to replace them anyway @@ -898,7 +898,7 @@ namespace std // Long enough for the max format spec. char __fbuf[16]; -#ifdef _GLIBCPP_USE_C99 +#ifdef _GLIBCXX_USE_C99 // First try a buffer perhaps big enough (for sure sufficient // for non-ios_base::fixed outputs) int __cs_size = __max_digits * 3; @@ -1032,7 +1032,7 @@ namespace std unsigned long __v) const { return _M_convert_int(__s, __io, __fill, __v); } -#ifdef _GLIBCPP_USE_LONG_LONG +#ifdef _GLIBCXX_USE_LONG_LONG template<typename _CharT, typename _OutIter> _OutIter num_put<_CharT, _OutIter>:: @@ -1320,7 +1320,7 @@ namespace std { const locale __loc = __io.getloc(); const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc); -#ifdef _GLIBCPP_USE_C99 +#ifdef _GLIBCXX_USE_C99 // First try a buffer perhaps big enough. int __cs_size = 64; char* __cs = static_cast<char*>(__builtin_alloca(__cs_size)); @@ -2295,7 +2295,7 @@ namespace std // Inhibit implicit instantiations for required instantiations, // which are defined via explicit instantiations elsewhere. // NB: This syntax is a GNU extension. -#if _GLIBCPP_EXTERN_TEMPLATE +#if _GLIBCXX_EXTERN_TEMPLATE extern template class moneypunct<char, false>; extern template class moneypunct<char, true>; extern template class moneypunct_byname<char, false>; @@ -2422,7 +2422,7 @@ namespace std bool has_facet<messages<char> >(const locale&); -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T extern template class moneypunct<wchar_t, false>; extern template class moneypunct<wchar_t, true>; extern template class moneypunct_byname<wchar_t, false>; diff --git a/libstdc++-v3/include/bits/localefwd.h b/libstdc++-v3/include/bits/localefwd.h index 16fa882..a4507c3 100644 --- a/libstdc++-v3/include/bits/localefwd.h +++ b/libstdc++-v3/include/bits/localefwd.h @@ -37,8 +37,8 @@ * You should not attempt to use it directly. */ -#ifndef _CPP_BITS_LOCALE_FWD_H -#define _CPP_BITS_LOCALE_FWD_H 1 +#ifndef _LOCALE_FWD_H +#define _LOCALE_FWD_H 1 #pragma GCC system_header @@ -110,7 +110,7 @@ namespace std template<typename _CharT> class ctype; template<> class ctype<char>; -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T template<> class ctype<wchar_t>; #endif template<typename _CharT> @@ -122,7 +122,7 @@ namespace std template<typename _InternT, typename _ExternT, typename _StateT> class codecvt; template<> class codecvt<char, char, mbstate_t>; -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T template<> class codecvt<wchar_t, char, mbstate_t>; #endif template<typename _InternT, typename _ExternT, typename _StateT> diff --git a/libstdc++-v3/include/bits/mask_array.h b/libstdc++-v3/include/bits/mask_array.h index 74ccdd0..ba67db7 100644 --- a/libstdc++-v3/include/bits/mask_array.h +++ b/libstdc++-v3/include/bits/mask_array.h @@ -35,8 +35,8 @@ * You should not attempt to use it directly. */ -#ifndef _CPP_BITS_MASK_ARRAY_H -#define _CPP_BITS_MASK_ARRAY_H 1 +#ifndef _MASK_ARRAY_H +#define _MASK_ARRAY_H 1 #pragma GCC system_header @@ -160,7 +160,7 @@ _DEFINE_VALARRAY_OPERATOR(>>, __shift_right) } // std:: -#endif /* _CPP_BITS_MASK_ARRAY_H */ +#endif /* _MASK_ARRAY_H */ // Local Variables: // mode:c++ diff --git a/libstdc++-v3/include/bits/ostream.tcc b/libstdc++-v3/include/bits/ostream.tcc index b71bdb8..942a305 100644 --- a/libstdc++-v3/include/bits/ostream.tcc +++ b/libstdc++-v3/include/bits/ostream.tcc @@ -32,6 +32,9 @@ // ISO C++ 14882: 27.6.2 Output streams // +#ifndef _OSTREAM_TCC +#define _OSTREAM_TCC 1 + #pragma GCC system_header #include <locale> @@ -235,7 +238,7 @@ namespace std return *this; } -#ifdef _GLIBCPP_USE_LONG_LONG +#ifdef _GLIBCXX_USE_LONG_LONG template<typename _CharT, typename _Traits> basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::operator<<(long long __n) @@ -431,7 +434,7 @@ namespace std { if (!this->fail()) { -#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS +#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS // 136. seekp, seekg setting wrong streams? pos_type __err = this->rdbuf()->pubseekpos(__pos, ios_base::out); @@ -450,7 +453,7 @@ namespace std { if (!this->fail()) { -#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS +#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS // 136. seekp, seekg setting wrong streams? pos_type __err = this->rdbuf()->pubseekoff(__off, __d, ios_base::out); @@ -577,7 +580,7 @@ namespace std operator<<(basic_ostream<_CharT, _Traits>& __out, const char* __s) { typedef basic_ostream<_CharT, _Traits> __ostream_type; -#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS +#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS // 167. Improper use of traits_type::length() // Note that this is only in 'Review' status. typedef char_traits<char> __traits_type; @@ -674,7 +677,7 @@ namespace std const streamsize __w = __out.width() > 0 ? __out.width() : 0; _CharT* __pads = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT) * __w)); streamsize __len = static_cast<streamsize>(__str.size()); -#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS +#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS // 25. String operator<< uses width() value wrong #endif if (__w > __len) @@ -693,7 +696,7 @@ namespace std // Inhibit implicit instantiations for required instantiations, // which are defined via explicit instantiations elsewhere. // NB: This syntax is a GNU extension. -#if _GLIBCPP_EXTERN_TEMPLATE +#if _GLIBCXX_EXTERN_TEMPLATE extern template class basic_ostream<char>; extern template ostream& endl(ostream&); extern template ostream& ends(ostream&); @@ -705,7 +708,7 @@ namespace std extern template ostream& operator<<(ostream&, const unsigned char*); extern template ostream& operator<<(ostream&, const signed char*); -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T extern template class basic_ostream<wchar_t>; extern template wostream& endl(wostream&); extern template wostream& ends(wostream&); @@ -717,3 +720,5 @@ namespace std #endif #endif } // namespace std + +#endif diff --git a/libstdc++-v3/include/bits/slice_array.h b/libstdc++-v3/include/bits/slice_array.h index c2c8930..ad33a47 100644 --- a/libstdc++-v3/include/bits/slice_array.h +++ b/libstdc++-v3/include/bits/slice_array.h @@ -34,8 +34,8 @@ * You should not attempt to use it directly. */ -#ifndef _CPP_BITS_SLICE_ARRAY_H -#define _CPP_BITS_SLICE_ARRAY_H 1 +#ifndef _SLICE_ARRAY_H +#define _SLICE_ARRAY_H 1 #pragma GCC system_header @@ -211,7 +211,7 @@ _DEFINE_VALARRAY_OPERATOR(>>, __shift_right) } // std:: -#endif /* _CPP_BITS_SLICE_ARRAY_H */ +#endif /* _SLICE_ARRAY_H */ // Local Variables: // mode:c++ diff --git a/libstdc++-v3/include/bits/sstream.tcc b/libstdc++-v3/include/bits/sstream.tcc index d512e8a..0430a26 100644 --- a/libstdc++-v3/include/bits/sstream.tcc +++ b/libstdc++-v3/include/bits/sstream.tcc @@ -32,8 +32,8 @@ // ISO C++ 14882: 27.7 String-based streams // -#ifndef _CPP_BITS_SSTREAM_TCC -#define _CPP_BITS_SSTREAM_TCC 1 +#ifndef _SSTREAM_TCC +#define _SSTREAM_TCC 1 #pragma GCC system_header @@ -214,7 +214,7 @@ namespace std extern template class basic_ostringstream<char>; extern template class basic_stringstream<char>; -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T extern template class basic_stringbuf<wchar_t>; extern template class basic_istringstream<wchar_t>; extern template class basic_ostringstream<wchar_t>; diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h index 3b00005..f4ba553 100644 --- a/libstdc++-v3/include/bits/stl_algo.h +++ b/libstdc++-v3/include/bits/stl_algo.h @@ -58,13 +58,13 @@ * You should not attempt to use it directly. */ -#ifndef __GLIBCPP_INTERNAL_ALGO_H -#define __GLIBCPP_INTERNAL_ALGO_H +#ifndef _ALGO_H +#define _ALGO_H 1 #include <bits/stl_heap.h> #include <bits/stl_tempbuf.h> // for _Temporary_buffer -// See concept_check.h for the __glibcpp_*_requires macros. +// See concept_check.h for the __glibcxx_*_requires macros. namespace std { @@ -86,7 +86,7 @@ namespace std __median(const _Tp& __a, const _Tp& __b, const _Tp& __c) { // concept requirements - __glibcpp_function_requires(_LessThanComparableConcept<_Tp>) + __glibcxx_function_requires(_LessThanComparableConcept<_Tp>) if (__a < __b) if (__b < __c) return __b; @@ -120,7 +120,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>) + __glibcxx_function_requires(_BinaryFunctionConcept<_Compare,bool,_Tp,_Tp>) if (__comp(__a, __b)) if (__comp(__b, __c)) return __b; @@ -152,7 +152,7 @@ namespace std for_each(_InputIterator __first, _InputIterator __last, _Function __f) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>) + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>) for ( ; __first != __last; ++__first) __f(*__first); return __f; @@ -292,8 +292,8 @@ namespace std const _Tp& __val) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>) - __glibcpp_function_requires(_EqualOpConcept< + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>) + __glibcxx_function_requires(_EqualOpConcept< typename iterator_traits<_InputIterator>::value_type, _Tp>) return std::find(__first, __last, __val, std::__iterator_category(__first)); } @@ -312,8 +312,8 @@ namespace std _Predicate __pred) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>) - __glibcpp_function_requires(_UnaryPredicateConcept<_Predicate, + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>) + __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate, typename iterator_traits<_InputIterator>::value_type>) return std::find_if(__first, __last, __pred, std::__iterator_category(__first)); } @@ -331,8 +331,8 @@ namespace std adjacent_find(_ForwardIterator __first, _ForwardIterator __last) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>) - __glibcpp_function_requires(_EqualityComparableConcept< + __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) + __glibcxx_function_requires(_EqualityComparableConcept< typename iterator_traits<_ForwardIterator>::value_type>) if (__first == __last) return __last; @@ -361,8 +361,8 @@ namespace std _BinaryPredicate __binary_pred) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>) - __glibcpp_function_requires(_BinaryPredicateConcept<_BinaryPredicate, + __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) + __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate, typename iterator_traits<_ForwardIterator>::value_type, typename iterator_traits<_ForwardIterator>::value_type>) if (__first == __last) @@ -389,10 +389,10 @@ namespace std count(_InputIterator __first, _InputIterator __last, const _Tp& __value) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>) - __glibcpp_function_requires(_EqualityComparableConcept< + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>) + __glibcxx_function_requires(_EqualityComparableConcept< typename iterator_traits<_InputIterator>::value_type >) - __glibcpp_function_requires(_EqualityComparableConcept<_Tp>) + __glibcxx_function_requires(_EqualityComparableConcept<_Tp>) typename iterator_traits<_InputIterator>::difference_type __n = 0; for ( ; __first != __last; ++__first) if (*__first == __value) @@ -413,8 +413,8 @@ namespace std count_if(_InputIterator __first, _InputIterator __last, _Predicate __pred) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>) - __glibcpp_function_requires(_UnaryPredicateConcept<_Predicate, + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>) + __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate, typename iterator_traits<_InputIterator>::value_type>) typename iterator_traits<_InputIterator>::difference_type __n = 0; for ( ; __first != __last; ++__first) @@ -453,9 +453,9 @@ namespace std _ForwardIterator2 __first2, _ForwardIterator2 __last2) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator1>) - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator2>) - __glibcpp_function_requires(_EqualOpConcept< + __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator1>) + __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator2>) + __glibcxx_function_requires(_EqualOpConcept< typename iterator_traits<_ForwardIterator1>::value_type, typename iterator_traits<_ForwardIterator2>::value_type>) @@ -526,9 +526,9 @@ namespace std _BinaryPredicate __predicate) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator1>) - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator2>) - __glibcpp_function_requires(_BinaryPredicateConcept<_BinaryPredicate, + __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator1>) + __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator2>) + __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate, typename iterator_traits<_ForwardIterator1>::value_type, typename iterator_traits<_ForwardIterator2>::value_type>) @@ -599,10 +599,10 @@ namespace std _Integer __count, const _Tp& __val) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>) - __glibcpp_function_requires(_EqualityComparableConcept< + __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) + __glibcxx_function_requires(_EqualityComparableConcept< typename iterator_traits<_ForwardIterator>::value_type>) - __glibcpp_function_requires(_EqualityComparableConcept<_Tp>) + __glibcxx_function_requires(_EqualityComparableConcept<_Tp>) if (__count <= 0) return __first; @@ -648,8 +648,8 @@ namespace std _BinaryPredicate __binary_pred) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>) - __glibcpp_function_requires(_BinaryPredicateConcept<_BinaryPredicate, + __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) + __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate, typename iterator_traits<_ForwardIterator>::value_type, _Tp>) if (__count <= 0) @@ -700,12 +700,12 @@ namespace std _ForwardIterator2 __first2) { // concept requirements - __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator1>) - __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator2>) - __glibcpp_function_requires(_ConvertibleConcept< + __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator1>) + __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator2>) + __glibcxx_function_requires(_ConvertibleConcept< typename iterator_traits<_ForwardIterator1>::value_type, typename iterator_traits<_ForwardIterator2>::value_type>) - __glibcpp_function_requires(_ConvertibleConcept< + __glibcxx_function_requires(_ConvertibleConcept< typename iterator_traits<_ForwardIterator2>::value_type, typename iterator_traits<_ForwardIterator1>::value_type>) @@ -735,8 +735,8 @@ namespace std _OutputIterator __result, _UnaryOperation __unary_op) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>) - __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>) + __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, // "the type returned by a _UnaryOperation" __typeof__(__unary_op(*__first))>) @@ -770,9 +770,9 @@ namespace std _BinaryOperation __binary_op) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>) - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>) - __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>) + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>) + __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, // "the type returned by a _BinaryOperation" __typeof__(__binary_op(*__first1,*__first2))>) @@ -799,10 +799,10 @@ namespace std const _Tp& __old_value, const _Tp& __new_value) { // concept requirements - __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>) - __glibcpp_function_requires(_EqualOpConcept< + __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>) + __glibcxx_function_requires(_EqualOpConcept< typename iterator_traits<_ForwardIterator>::value_type, _Tp>) - __glibcpp_function_requires(_ConvertibleConcept<_Tp, + __glibcxx_function_requires(_ConvertibleConcept<_Tp, typename iterator_traits<_ForwardIterator>::value_type>) for ( ; __first != __last; ++__first) @@ -828,10 +828,10 @@ namespace std _Predicate __pred, const _Tp& __new_value) { // concept requirements - __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>) - __glibcpp_function_requires(_ConvertibleConcept<_Tp, + __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>) + __glibcxx_function_requires(_ConvertibleConcept<_Tp, typename iterator_traits<_ForwardIterator>::value_type>) - __glibcpp_function_requires(_UnaryPredicateConcept<_Predicate, + __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate, typename iterator_traits<_ForwardIterator>::value_type>) for ( ; __first != __last; ++__first) @@ -860,10 +860,10 @@ namespace std const _Tp& __old_value, const _Tp& __new_value) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>) - __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>) + __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, typename iterator_traits<_InputIterator>::value_type>) - __glibcpp_function_requires(_EqualOpConcept< + __glibcxx_function_requires(_EqualOpConcept< typename iterator_traits<_InputIterator>::value_type, _Tp>) for ( ; __first != __last; ++__first, ++__result) @@ -893,10 +893,10 @@ namespace std _Predicate __pred, const _Tp& __new_value) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>) - __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>) + __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, typename iterator_traits<_InputIterator>::value_type>) - __glibcpp_function_requires(_UnaryPredicateConcept<_Predicate, + __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate, typename iterator_traits<_InputIterator>::value_type>) for ( ; __first != __last; ++__first, ++__result) @@ -920,8 +920,8 @@ namespace std generate(_ForwardIterator __first, _ForwardIterator __last, _Generator __gen) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>) - __glibcpp_function_requires(_GeneratorConcept<_Generator, + __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) + __glibcxx_function_requires(_GeneratorConcept<_Generator, typename iterator_traits<_ForwardIterator>::value_type>) for ( ; __first != __last; ++__first) @@ -944,7 +944,7 @@ namespace std generate_n(_OutputIterator __first, _Size __n, _Generator __gen) { // concept requirements - __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, + __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, // "the type returned by a _Generator" __typeof__(gen())>) @@ -972,10 +972,10 @@ namespace std _OutputIterator __result, const _Tp& __value) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>) - __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>) + __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, typename iterator_traits<_InputIterator>::value_type>) - __glibcpp_function_requires(_EqualOpConcept< + __glibcxx_function_requires(_EqualOpConcept< typename iterator_traits<_InputIterator>::value_type, _Tp>) for ( ; __first != __last; ++__first) @@ -1006,10 +1006,10 @@ namespace std _OutputIterator __result, _Predicate __pred) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>) - __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>) + __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, typename iterator_traits<_InputIterator>::value_type>) - __glibcpp_function_requires(_UnaryPredicateConcept<_Predicate, + __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate, typename iterator_traits<_InputIterator>::value_type>) for ( ; __first != __last; ++__first) @@ -1042,10 +1042,10 @@ namespace std const _Tp& __value) { // concept requirements - __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>) - __glibcpp_function_requires(_ConvertibleConcept<_Tp, + __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>) + __glibcxx_function_requires(_ConvertibleConcept<_Tp, typename iterator_traits<_ForwardIterator>::value_type>) - __glibcpp_function_requires(_EqualOpConcept< + __glibcxx_function_requires(_EqualOpConcept< typename iterator_traits<_ForwardIterator>::value_type, _Tp>) __first = std::find(__first, __last, __value); @@ -1076,8 +1076,8 @@ namespace std _Predicate __pred) { // concept requirements - __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>) - __glibcpp_function_requires(_UnaryPredicateConcept<_Predicate, + __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>) + __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate, typename iterator_traits<_ForwardIterator>::value_type>) __first = std::find_if(__first, __last, __pred); @@ -1144,7 +1144,7 @@ namespace std output_iterator_tag) { // concept requirements -- iterators already checked - __glibcpp_function_requires(_BinaryPredicateConcept<_BinaryPredicate, + __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate, typename iterator_traits<_InputIterator>::value_type, typename iterator_traits<_InputIterator>::value_type>) @@ -1173,7 +1173,7 @@ namespace std forward_iterator_tag) { // concept requirements -- iterators already checked - __glibcpp_function_requires(_BinaryPredicateConcept<_BinaryPredicate, + __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate, typename iterator_traits<_ForwardIterator>::value_type, typename iterator_traits<_InputIterator>::value_type>) @@ -1202,10 +1202,10 @@ namespace std _OutputIterator __result) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>) - __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>) + __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, typename iterator_traits<_InputIterator>::value_type>) - __glibcpp_function_requires(_EqualityComparableConcept< + __glibcxx_function_requires(_EqualityComparableConcept< typename iterator_traits<_InputIterator>::value_type>) typedef typename iterator_traits<_OutputIterator>::iterator_category _IterType; @@ -1236,8 +1236,8 @@ namespace std _BinaryPredicate __binary_pred) { // concept requirements -- predicates checked later - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>) - __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>) + __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, typename iterator_traits<_InputIterator>::value_type>) typedef typename iterator_traits<_OutputIterator>::iterator_category _IterType; @@ -1264,8 +1264,8 @@ namespace std unique(_ForwardIterator __first, _ForwardIterator __last) { // concept requirements - __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>) - __glibcpp_function_requires(_EqualityComparableConcept< + __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>) + __glibcxx_function_requires(_EqualityComparableConcept< typename iterator_traits<_ForwardIterator>::value_type>) __first = std::adjacent_find(__first, __last); @@ -1292,8 +1292,8 @@ namespace std _BinaryPredicate __binary_pred) { // concept requirements - __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>) - __glibcpp_function_requires(_BinaryPredicateConcept<_BinaryPredicate, + __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>) + __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate, typename iterator_traits<_ForwardIterator>::value_type, typename iterator_traits<_ForwardIterator>::value_type>) @@ -1350,7 +1350,7 @@ namespace std reverse(_BidirectionalIterator __first, _BidirectionalIterator __last) { // concept requirements - __glibcpp_function_requires(_Mutable_BidirectionalIteratorConcept< + __glibcxx_function_requires(_Mutable_BidirectionalIteratorConcept< _BidirectionalIterator>) std::__reverse(__first, __last, std::__iterator_category(__first)); } @@ -1376,8 +1376,8 @@ namespace std _OutputIterator __result) { // concept requirements - __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator>) - __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, + __glibcxx_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator>) + __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, typename iterator_traits<_BidirectionalIterator>::value_type>) while (__first != __last) { @@ -1453,7 +1453,7 @@ namespace std bidirectional_iterator_tag) { // concept requirements - __glibcpp_function_requires(_Mutable_BidirectionalIteratorConcept< + __glibcxx_function_requires(_Mutable_BidirectionalIteratorConcept< _BidirectionalIterator>) if ((__first == __middle) || (__last == __middle)) @@ -1486,7 +1486,7 @@ namespace std random_access_iterator_tag) { // concept requirements - __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept< + __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept< _RandomAccessIterator>) if ((__first == __middle) || (__last == __middle)) @@ -1562,7 +1562,7 @@ namespace std rotate(_ForwardIterator __first, _ForwardIterator __middle, _ForwardIterator __last) { // concept requirements - __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>) + __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>) typedef typename iterator_traits<_ForwardIterator>::iterator_category _IterType; std::__rotate(__first, __middle, __last, _IterType()); @@ -1591,8 +1591,8 @@ namespace std _ForwardIterator __last, _OutputIterator __result) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>) - __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, + __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) + __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, typename iterator_traits<_ForwardIterator>::value_type>) return std::copy(__first, __middle, copy(__middle, __last, __result)); @@ -1612,7 +1612,7 @@ namespace std inline _Distance __random_number(_Distance __n) { - #ifdef _GLIBCPP_HAVE_DRAND48 + #ifdef _GLIBCXX_HAVE_DRAND48 return lrand48() % __n; #else return rand() % __n; @@ -1635,7 +1635,7 @@ namespace std random_shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last) { // concept requirements - __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept< + __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept< _RandomAccessIterator>) if (__first == __last) return; @@ -1662,7 +1662,7 @@ namespace std _RandomNumberGenerator& __rand) { // concept requirements - __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept< + __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept< _RandomAccessIterator>) if (__first == __last) return; @@ -1750,8 +1750,8 @@ namespace std _Predicate __pred) { // concept requirements - __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>) - __glibcpp_function_requires(_UnaryPredicateConcept<_Predicate, + __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>) + __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate, typename iterator_traits<_ForwardIterator>::value_type>) return std::__partition(__first, __last, __pred, std::__iterator_category(__first)); @@ -1850,8 +1850,8 @@ namespace std _Predicate __pred) { // concept requirements - __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>) - __glibcpp_function_requires(_UnaryPredicateConcept<_Predicate, + __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>) + __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate, typename iterator_traits<_ForwardIterator>::value_type>) if (__first == __last) @@ -2116,9 +2116,9 @@ namespace std typedef typename iterator_traits<_RandomAccessIterator>::value_type _ValueType; // concept requirements - __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept< + __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept< _RandomAccessIterator>) - __glibcpp_function_requires(_LessThanComparableConcept<_ValueType>) + __glibcxx_function_requires(_LessThanComparableConcept<_ValueType>) std::make_heap(__first, __middle); for (_RandomAccessIterator __i = __middle; __i < __last; ++__i) @@ -2155,9 +2155,9 @@ namespace std typedef typename iterator_traits<_RandomAccessIterator>::value_type _ValueType; // concept requirements - __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept< + __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept< _RandomAccessIterator>) - __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, + __glibcxx_function_requires(_BinaryPredicateConcept<_Compare, _ValueType, _ValueType>) std::make_heap(__first, __middle, __comp); @@ -2195,10 +2195,10 @@ namespace std typedef typename iterator_traits<_RandomAccessIterator>::difference_type _DistanceType; // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>) - __glibcpp_function_requires(_ConvertibleConcept<_InputValueType, _OutputValueType>) - __glibcpp_function_requires(_LessThanComparableConcept<_OutputValueType>) - __glibcpp_function_requires(_LessThanComparableConcept<_InputValueType>) + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>) + __glibcxx_function_requires(_ConvertibleConcept<_InputValueType, _OutputValueType>) + __glibcxx_function_requires(_LessThanComparableConcept<_OutputValueType>) + __glibcxx_function_requires(_LessThanComparableConcept<_InputValueType>) if (__result_first == __result_last) return __result_last; _RandomAccessIterator __result_real_last = __result_first; @@ -2250,10 +2250,10 @@ namespace std typedef typename iterator_traits<_RandomAccessIterator>::difference_type _DistanceType; // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>) - __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<_RandomAccessIterator>) - __glibcpp_function_requires(_ConvertibleConcept<_InputValueType, _OutputValueType>) - __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>) + __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<_RandomAccessIterator>) + __glibcxx_function_requires(_ConvertibleConcept<_InputValueType, _OutputValueType>) + __glibcxx_function_requires(_BinaryPredicateConcept<_Compare, _OutputValueType, _OutputValueType>) if (__result_first == __result_last) return __result_last; @@ -2352,9 +2352,9 @@ namespace std typedef typename iterator_traits<_RandomAccessIterator>::value_type _ValueType; // concept requirements - __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept< + __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept< _RandomAccessIterator>) - __glibcpp_function_requires(_LessThanComparableConcept<_ValueType>) + __glibcxx_function_requires(_LessThanComparableConcept<_ValueType>) if (__first != __last) { std::__introsort_loop(__first, __last, __lg(__last - __first) * 2); @@ -2383,9 +2383,9 @@ namespace std typedef typename iterator_traits<_RandomAccessIterator>::value_type _ValueType; // concept requirements - __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept< + __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept< _RandomAccessIterator>) - __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, _ValueType, _ValueType>) + __glibcxx_function_requires(_BinaryPredicateConcept<_Compare, _ValueType, _ValueType>) if (__first != __last) { std::__introsort_loop(__first, __last, __lg(__last - __first) * 2, __comp); @@ -2415,9 +2415,9 @@ namespace std // version, defined next. The difference is in the strictness of the // comparison operations... so for looser checking, define your own // comparison function, as was intended. - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>) - __glibcpp_function_requires(_SameTypeConcept<_Tp, _ValueType>) - __glibcpp_function_requires(_LessThanComparableConcept<_Tp>) + __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) + __glibcxx_function_requires(_SameTypeConcept<_Tp, _ValueType>) + __glibcxx_function_requires(_LessThanComparableConcept<_Tp>) _DistanceType __len = std::distance(__first, __last); _DistanceType __half; @@ -2461,8 +2461,8 @@ namespace std typedef typename iterator_traits<_ForwardIterator>::difference_type _DistanceType; // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>) - __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, _ValueType, _Tp>) + __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) + __glibcxx_function_requires(_BinaryPredicateConcept<_Compare, _ValueType, _Tp>) _DistanceType __len = std::distance(__first, __last); _DistanceType __half; @@ -2502,9 +2502,9 @@ namespace std // concept requirements // See comments on lower_bound. - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>) - __glibcpp_function_requires(_SameTypeConcept<_Tp, _ValueType>) - __glibcpp_function_requires(_LessThanComparableConcept<_Tp>) + __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) + __glibcxx_function_requires(_SameTypeConcept<_Tp, _ValueType>) + __glibcxx_function_requires(_LessThanComparableConcept<_Tp>) _DistanceType __len = std::distance(__first, __last); _DistanceType __half; @@ -2548,8 +2548,8 @@ namespace std typedef typename iterator_traits<_ForwardIterator>::difference_type _DistanceType; // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>) - __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, _Tp, _ValueType>) + __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) + __glibcxx_function_requires(_BinaryPredicateConcept<_Compare, _Tp, _ValueType>) _DistanceType __len = std::distance(__first, __last); _DistanceType __half; @@ -2726,14 +2726,14 @@ namespace std _OutputIterator __result) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>) - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>) - __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>) + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>) + __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, typename iterator_traits<_InputIterator1>::value_type>) - __glibcpp_function_requires(_SameTypeConcept< + __glibcxx_function_requires(_SameTypeConcept< typename iterator_traits<_InputIterator1>::value_type, typename iterator_traits<_InputIterator2>::value_type>) - __glibcpp_function_requires(_LessThanComparableConcept< + __glibcxx_function_requires(_LessThanComparableConcept< typename iterator_traits<_InputIterator1>::value_type>) while (__first1 != __last1 && __first2 != __last2) { @@ -2778,14 +2778,14 @@ namespace std _OutputIterator __result, _Compare __comp) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>) - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>) - __glibcpp_function_requires(_SameTypeConcept< + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>) + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>) + __glibcxx_function_requires(_SameTypeConcept< typename iterator_traits<_InputIterator1>::value_type, typename iterator_traits<_InputIterator2>::value_type>) - __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, + __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, typename iterator_traits<_InputIterator1>::value_type>) - __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, + __glibcxx_function_requires(_BinaryPredicateConcept<_Compare, typename iterator_traits<_InputIterator1>::value_type, typename iterator_traits<_InputIterator2>::value_type>) @@ -3147,9 +3147,9 @@ namespace std _DistanceType; // concept requirements - __glibcpp_function_requires(_Mutable_BidirectionalIteratorConcept< + __glibcxx_function_requires(_Mutable_BidirectionalIteratorConcept< _BidirectionalIterator>) - __glibcpp_function_requires(_LessThanComparableConcept<_ValueType>) + __glibcxx_function_requires(_LessThanComparableConcept<_ValueType>) if (__first == __middle || __middle == __last) return; @@ -3199,9 +3199,9 @@ namespace std _DistanceType; // concept requirements - __glibcpp_function_requires(_Mutable_BidirectionalIteratorConcept< + __glibcxx_function_requires(_Mutable_BidirectionalIteratorConcept< _BidirectionalIterator>) - __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, + __glibcxx_function_requires(_BinaryPredicateConcept<_Compare, _ValueType, _ValueType>) if (__first == __middle || __middle == __last) @@ -3286,9 +3286,9 @@ namespace std typedef typename iterator_traits<_RandomAccessIterator>::difference_type _DistanceType; // concept requirements - __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept< + __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept< _RandomAccessIterator>) - __glibcpp_function_requires(_LessThanComparableConcept<_ValueType>) + __glibcxx_function_requires(_LessThanComparableConcept<_ValueType>) _Temporary_buffer<_RandomAccessIterator, _ValueType> buf(__first, __last); if (buf.begin() == 0) @@ -3322,9 +3322,9 @@ namespace std typedef typename iterator_traits<_RandomAccessIterator>::difference_type _DistanceType; // concept requirements - __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept< + __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept< _RandomAccessIterator>) - __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, + __glibcxx_function_requires(_BinaryPredicateConcept<_Compare, _ValueType, _ValueType>) _Temporary_buffer<_RandomAccessIterator, _ValueType> buf(__first, __last); @@ -3359,8 +3359,8 @@ namespace std typedef typename iterator_traits<_RandomAccessIterator>::value_type _ValueType; // concept requirements - __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<_RandomAccessIterator>) - __glibcpp_function_requires(_LessThanComparableConcept<_ValueType>) + __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<_RandomAccessIterator>) + __glibcxx_function_requires(_LessThanComparableConcept<_ValueType>) while (__last - __first > 3) { _RandomAccessIterator __cut = @@ -3402,8 +3402,8 @@ namespace std typedef typename iterator_traits<_RandomAccessIterator>::value_type _ValueType; // concept requirements - __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<_RandomAccessIterator>) - __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, + __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<_RandomAccessIterator>) + __glibcxx_function_requires(_BinaryPredicateConcept<_Compare, _ValueType, _ValueType>) while (__last - __first > 3) { @@ -3446,9 +3446,9 @@ namespace std // concept requirements // See comments on lower_bound. - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>) - __glibcpp_function_requires(_SameTypeConcept<_Tp, _ValueType>) - __glibcpp_function_requires(_LessThanComparableConcept<_Tp>) + __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) + __glibcxx_function_requires(_SameTypeConcept<_Tp, _ValueType>) + __glibcxx_function_requires(_LessThanComparableConcept<_Tp>) _DistanceType __len = std::distance(__first, __last); _DistanceType __half; @@ -3501,9 +3501,9 @@ namespace std typedef typename iterator_traits<_ForwardIterator>::difference_type _DistanceType; // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>) - __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, _ValueType, _Tp>) - __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, _Tp, _ValueType>) + __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) + __glibcxx_function_requires(_BinaryPredicateConcept<_Compare, _ValueType, _Tp>) + __glibcxx_function_requires(_BinaryPredicateConcept<_Compare, _Tp, _ValueType>) _DistanceType __len = std::distance(__first, __last); _DistanceType __half; @@ -3548,10 +3548,10 @@ namespace std { // concept requirements // See comments on lower_bound. - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>) - __glibcpp_function_requires(_SameTypeConcept<_Tp, + __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) + __glibcxx_function_requires(_SameTypeConcept<_Tp, typename iterator_traits<_ForwardIterator>::value_type>) - __glibcpp_function_requires(_LessThanComparableConcept<_Tp>) + __glibcxx_function_requires(_LessThanComparableConcept<_Tp>) _ForwardIterator __i = std::lower_bound(__first, __last, __val); return __i != __last && !(__val < *__i); @@ -3578,10 +3578,10 @@ namespace std const _Tp& __val, _Compare __comp) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>) - __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, + __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) + __glibcxx_function_requires(_BinaryPredicateConcept<_Compare, typename iterator_traits<_ForwardIterator>::value_type, _Tp>) - __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, _Tp, + __glibcxx_function_requires(_BinaryPredicateConcept<_Compare, _Tp, typename iterator_traits<_ForwardIterator>::value_type>) _ForwardIterator __i = std::lower_bound(__first, __last, __val, __comp); @@ -3599,12 +3599,12 @@ namespace std _InputIterator2 __first2, _InputIterator2 __last2) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>) - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>) - __glibcpp_function_requires(_SameTypeConcept< + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>) + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>) + __glibcxx_function_requires(_SameTypeConcept< typename iterator_traits<_InputIterator1>::value_type, typename iterator_traits<_InputIterator2>::value_type>) - __glibcpp_function_requires(_LessThanComparableConcept< + __glibcxx_function_requires(_LessThanComparableConcept< typename iterator_traits<_InputIterator1>::value_type>) while (__first1 != __last1 && __first2 != __last2) @@ -3624,12 +3624,12 @@ namespace std _InputIterator2 __first2, _InputIterator2 __last2, _Compare __comp) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>) - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>) - __glibcpp_function_requires(_SameTypeConcept< + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>) + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>) + __glibcxx_function_requires(_SameTypeConcept< typename iterator_traits<_InputIterator1>::value_type, typename iterator_traits<_InputIterator2>::value_type>) - __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, + __glibcxx_function_requires(_BinaryPredicateConcept<_Compare, typename iterator_traits<_InputIterator1>::value_type, typename iterator_traits<_InputIterator2>::value_type>) @@ -3651,14 +3651,14 @@ namespace std _OutputIterator __result) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>) - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>) - __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>) + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>) + __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, typename iterator_traits<_InputIterator1>::value_type>) - __glibcpp_function_requires(_SameTypeConcept< + __glibcxx_function_requires(_SameTypeConcept< typename iterator_traits<_InputIterator1>::value_type, typename iterator_traits<_InputIterator2>::value_type>) - __glibcpp_function_requires(_LessThanComparableConcept< + __glibcxx_function_requires(_LessThanComparableConcept< typename iterator_traits<_InputIterator1>::value_type>) while (__first1 != __last1 && __first2 != __last2) { @@ -3688,14 +3688,14 @@ namespace std _OutputIterator __result, _Compare __comp) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>) - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>) - __glibcpp_function_requires(_SameTypeConcept< + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>) + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>) + __glibcxx_function_requires(_SameTypeConcept< typename iterator_traits<_InputIterator1>::value_type, typename iterator_traits<_InputIterator2>::value_type>) - __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, + __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, typename iterator_traits<_InputIterator1>::value_type>) - __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, + __glibcxx_function_requires(_BinaryPredicateConcept<_Compare, typename iterator_traits<_InputIterator1>::value_type, typename iterator_traits<_InputIterator2>::value_type>) @@ -3725,14 +3725,14 @@ namespace std _OutputIterator __result) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>) - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>) - __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>) + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>) + __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, typename iterator_traits<_InputIterator1>::value_type>) - __glibcpp_function_requires(_SameTypeConcept< + __glibcxx_function_requires(_SameTypeConcept< typename iterator_traits<_InputIterator1>::value_type, typename iterator_traits<_InputIterator2>::value_type>) - __glibcpp_function_requires(_LessThanComparableConcept< + __glibcxx_function_requires(_LessThanComparableConcept< typename iterator_traits<_InputIterator1>::value_type>) while (__first1 != __last1 && __first2 != __last2) @@ -3757,14 +3757,14 @@ namespace std _OutputIterator __result, _Compare __comp) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>) - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>) - __glibcpp_function_requires(_SameTypeConcept< + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>) + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>) + __glibcxx_function_requires(_SameTypeConcept< typename iterator_traits<_InputIterator1>::value_type, typename iterator_traits<_InputIterator2>::value_type>) - __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, + __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, typename iterator_traits<_InputIterator1>::value_type>) - __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, + __glibcxx_function_requires(_BinaryPredicateConcept<_Compare, typename iterator_traits<_InputIterator1>::value_type, typename iterator_traits<_InputIterator2>::value_type>) @@ -3789,14 +3789,14 @@ namespace std _OutputIterator __result) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>) - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>) - __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>) + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>) + __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, typename iterator_traits<_InputIterator1>::value_type>) - __glibcpp_function_requires(_SameTypeConcept< + __glibcxx_function_requires(_SameTypeConcept< typename iterator_traits<_InputIterator1>::value_type, typename iterator_traits<_InputIterator2>::value_type>) - __glibcpp_function_requires(_LessThanComparableConcept< + __glibcxx_function_requires(_LessThanComparableConcept< typename iterator_traits<_InputIterator1>::value_type>) while (__first1 != __last1 && __first2 != __last2) @@ -3822,14 +3822,14 @@ namespace std _OutputIterator __result, _Compare __comp) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>) - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>) - __glibcpp_function_requires(_SameTypeConcept< + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>) + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>) + __glibcxx_function_requires(_SameTypeConcept< typename iterator_traits<_InputIterator1>::value_type, typename iterator_traits<_InputIterator2>::value_type>) - __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, + __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, typename iterator_traits<_InputIterator1>::value_type>) - __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, + __glibcxx_function_requires(_BinaryPredicateConcept<_Compare, typename iterator_traits<_InputIterator1>::value_type, typename iterator_traits<_InputIterator2>::value_type>) @@ -3855,14 +3855,14 @@ namespace std _OutputIterator __result) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>) - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>) - __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>) + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>) + __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, typename iterator_traits<_InputIterator1>::value_type>) - __glibcpp_function_requires(_SameTypeConcept< + __glibcxx_function_requires(_SameTypeConcept< typename iterator_traits<_InputIterator1>::value_type, typename iterator_traits<_InputIterator2>::value_type>) - __glibcpp_function_requires(_LessThanComparableConcept< + __glibcxx_function_requires(_LessThanComparableConcept< typename iterator_traits<_InputIterator1>::value_type>) while (__first1 != __last1 && __first2 != __last2) @@ -3892,14 +3892,14 @@ namespace std _Compare __comp) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>) - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>) - __glibcpp_function_requires(_SameTypeConcept< + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>) + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>) + __glibcxx_function_requires(_SameTypeConcept< typename iterator_traits<_InputIterator1>::value_type, typename iterator_traits<_InputIterator2>::value_type>) - __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, + __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, typename iterator_traits<_InputIterator1>::value_type>) - __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, + __glibcxx_function_requires(_BinaryPredicateConcept<_Compare, typename iterator_traits<_InputIterator1>::value_type, typename iterator_traits<_InputIterator2>::value_type>) @@ -3929,8 +3929,8 @@ namespace std max_element(_ForwardIterator __first, _ForwardIterator __last) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>) - __glibcpp_function_requires(_LessThanComparableConcept< + __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) + __glibcxx_function_requires(_LessThanComparableConcept< typename iterator_traits<_ForwardIterator>::value_type>) if (__first == __last) return __first; @@ -3947,8 +3947,8 @@ namespace std _Compare __comp) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>) - __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, + __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) + __glibcxx_function_requires(_BinaryPredicateConcept<_Compare, typename iterator_traits<_ForwardIterator>::value_type, typename iterator_traits<_ForwardIterator>::value_type>) @@ -3964,8 +3964,8 @@ namespace std min_element(_ForwardIterator __first, _ForwardIterator __last) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>) - __glibcpp_function_requires(_LessThanComparableConcept< + __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) + __glibcxx_function_requires(_LessThanComparableConcept< typename iterator_traits<_ForwardIterator>::value_type>) if (__first == __last) return __first; @@ -3982,8 +3982,8 @@ namespace std _Compare __comp) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>) - __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, + __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) + __glibcxx_function_requires(_BinaryPredicateConcept<_Compare, typename iterator_traits<_ForwardIterator>::value_type, typename iterator_traits<_ForwardIterator>::value_type>) @@ -4003,8 +4003,8 @@ namespace std next_permutation(_BidirectionalIterator __first, _BidirectionalIterator __last) { // concept requirements - __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator>) - __glibcpp_function_requires(_LessThanComparableConcept< + __glibcxx_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator>) + __glibcxx_function_requires(_LessThanComparableConcept< typename iterator_traits<_BidirectionalIterator>::value_type>) if (__first == __last) @@ -4040,8 +4040,8 @@ namespace std _Compare __comp) { // concept requirements - __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator>) - __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, + __glibcxx_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator>) + __glibcxx_function_requires(_BinaryPredicateConcept<_Compare, typename iterator_traits<_BidirectionalIterator>::value_type, typename iterator_traits<_BidirectionalIterator>::value_type>) @@ -4077,8 +4077,8 @@ namespace std prev_permutation(_BidirectionalIterator __first, _BidirectionalIterator __last) { // concept requirements - __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator>) - __glibcpp_function_requires(_LessThanComparableConcept< + __glibcxx_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator>) + __glibcxx_function_requires(_LessThanComparableConcept< typename iterator_traits<_BidirectionalIterator>::value_type>) if (__first == __last) @@ -4114,8 +4114,8 @@ namespace std _Compare __comp) { // concept requirements - __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator>) - __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, + __glibcxx_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator>) + __glibcxx_function_requires(_BinaryPredicateConcept<_Compare, typename iterator_traits<_BidirectionalIterator>::value_type, typename iterator_traits<_BidirectionalIterator>::value_type>) @@ -4154,9 +4154,9 @@ namespace std _ForwardIterator __first2, _ForwardIterator __last2) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>) - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>) - __glibcpp_function_requires(_EqualOpConcept< + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>) + __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) + __glibcxx_function_requires(_EqualOpConcept< typename iterator_traits<_InputIterator>::value_type, typename iterator_traits<_ForwardIterator>::value_type>) @@ -4174,12 +4174,12 @@ namespace std _BinaryPredicate __comp) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>) - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>) - __glibcpp_function_requires(_EqualOpConcept< + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>) + __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) + __glibcxx_function_requires(_EqualOpConcept< typename iterator_traits<_InputIterator>::value_type, typename iterator_traits<_ForwardIterator>::value_type>) - __glibcpp_function_requires(_BinaryPredicateConcept<_BinaryPredicate, + __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate, typename iterator_traits<_InputIterator>::value_type, typename iterator_traits<_ForwardIterator>::value_type>) @@ -4255,8 +4255,8 @@ namespace std bidirectional_iterator_tag, bidirectional_iterator_tag) { // concept requirements - __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator1>) - __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator2>) + __glibcxx_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator1>) + __glibcxx_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator2>) typedef reverse_iterator<_BidirectionalIterator1> _RevIterator1; typedef reverse_iterator<_BidirectionalIterator2> _RevIterator2; @@ -4284,8 +4284,8 @@ namespace std _BinaryPredicate __comp) { // concept requirements - __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator1>) - __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator2>) + __glibcxx_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator1>) + __glibcxx_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator2>) typedef reverse_iterator<_BidirectionalIterator1> _RevIterator1; typedef reverse_iterator<_BidirectionalIterator2> _RevIterator2; @@ -4313,9 +4313,9 @@ namespace std _ForwardIterator2 __first2, _ForwardIterator2 __last2) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator1>) - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator2>) - __glibcpp_function_requires(_EqualOpConcept< + __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator1>) + __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator2>) + __glibcxx_function_requires(_EqualOpConcept< typename iterator_traits<_ForwardIterator1>::value_type, typename iterator_traits<_ForwardIterator2>::value_type>) @@ -4332,9 +4332,9 @@ namespace std _BinaryPredicate __comp) { // concept requirements - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator1>) - __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator2>) - __glibcpp_function_requires(_BinaryPredicateConcept<_BinaryPredicate, + __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator1>) + __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator2>) + __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate, typename iterator_traits<_ForwardIterator1>::value_type, typename iterator_traits<_ForwardIterator2>::value_type>) @@ -4346,5 +4346,5 @@ namespace std } // namespace std -#endif /* __GLIBCPP_INTERNAL_ALGO_H */ +#endif /* _ALGO_H */ diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h index 3c68c42..57faf23 100644 --- a/libstdc++-v3/include/bits/stl_algobase.h +++ b/libstdc++-v3/include/bits/stl_algobase.h @@ -58,8 +58,8 @@ * You should not attempt to use it directly. */ -#ifndef __GLIBCPP_INTERNAL_ALGOBASE_H -#define __GLIBCPP_INTERNAL_ALGOBASE_H +#ifndef _ALGOBASE_H +#define _ALGOBASE_H 1 #include <bits/c++config.h> #include <cstring> @@ -94,10 +94,10 @@ namespace std typedef typename iterator_traits<_ForwardIterator2>::value_type _ValueType2; // concept requirements - __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator1>) - __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator2>) - __glibcpp_function_requires(_ConvertibleConcept<_ValueType1, _ValueType2>) - __glibcpp_function_requires(_ConvertibleConcept<_ValueType2, _ValueType1>) + __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator1>) + __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator2>) + __glibcxx_function_requires(_ConvertibleConcept<_ValueType1, _ValueType2>) + __glibcxx_function_requires(_ConvertibleConcept<_ValueType2, _ValueType1>) _ValueType1 __tmp = *__a; *__a = *__b; @@ -118,7 +118,7 @@ namespace std swap(_Tp& __a, _Tp& __b) { // concept requirements - __glibcpp_function_requires(_SGIAssignableConcept<_Tp>) + __glibcxx_function_requires(_SGIAssignableConcept<_Tp>) _Tp __tmp = __a; __a = __b; @@ -143,7 +143,7 @@ namespace std min(const _Tp& __a, const _Tp& __b) { // concept requirements - __glibcpp_function_requires(_LessThanComparableConcept<_Tp>) + __glibcxx_function_requires(_LessThanComparableConcept<_Tp>) //return __b < __a ? __b : __a; if (__b < __a) return __b; return __a; } @@ -163,7 +163,7 @@ namespace std max(const _Tp& __a, const _Tp& __b) { // concept requirements - __glibcpp_function_requires(_LessThanComparableConcept<_Tp>) + __glibcxx_function_requires(_LessThanComparableConcept<_Tp>) //return __a < __b ? __b : __a; if (__a < __b) return __b; return __a; } @@ -327,8 +327,8 @@ namespace std copy(_InputIterator __first, _InputIterator __last, _OutputIterator __result) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>) - __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>) + __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, typename iterator_traits<_InputIterator>::value_type>) typedef typename _Is_normal_iterator<_InputIterator>::_Normal __Normal; @@ -460,9 +460,9 @@ 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(_ConvertibleConcept< + __glibcxx_function_requires(_BidirectionalIteratorConcept<_BI1>) + __glibcxx_function_requires(_Mutable_BidirectionalIteratorConcept<_BI2>) + __glibcxx_function_requires(_ConvertibleConcept< typename iterator_traits<_BI1>::value_type, typename iterator_traits<_BI2>::value_type>) @@ -488,7 +488,7 @@ namespace std fill(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value) { // concept requirements - __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>) + __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>) for ( ; __first != __last; ++__first) *__first = __value; @@ -510,7 +510,7 @@ namespace std fill_n(_OutputIterator __first, _Size __n, const _Tp& __value) { // concept requirements - __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator,_Tp>) + __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,_Tp>) for ( ; __n > 0; --__n, ++__first) *__first = __value; @@ -582,11 +582,11 @@ namespace std _InputIterator2 __first2) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>) - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>) - __glibcpp_function_requires(_EqualityComparableConcept< + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>) + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>) + __glibcxx_function_requires(_EqualityComparableConcept< typename iterator_traits<_InputIterator1>::value_type>) - __glibcpp_function_requires(_EqualityComparableConcept< + __glibcxx_function_requires(_EqualityComparableConcept< typename iterator_traits<_InputIterator2>::value_type>) while (__first1 != __last1 && *__first1 == *__first2) @@ -617,8 +617,8 @@ namespace std _InputIterator2 __first2, _BinaryPredicate __binary_pred) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>) - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>) + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>) + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>) while (__first1 != __last1 && __binary_pred(*__first1, *__first2)) { @@ -644,9 +644,9 @@ namespace std equal(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>) - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>) - __glibcpp_function_requires(_EqualOpConcept< + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>) + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>) + __glibcxx_function_requires(_EqualOpConcept< typename iterator_traits<_InputIterator1>::value_type, typename iterator_traits<_InputIterator2>::value_type>) @@ -676,8 +676,8 @@ namespace std _BinaryPredicate __binary_pred) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>) - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>) + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>) + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>) for ( ; __first1 != __last1; ++__first1, ++__first2) if (!__binary_pred(*__first1, *__first2)) @@ -705,11 +705,11 @@ namespace std _InputIterator2 __first2, _InputIterator2 __last2) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>) - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>) - __glibcpp_function_requires(_LessThanComparableConcept< + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>) + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>) + __glibcxx_function_requires(_LessThanComparableConcept< typename iterator_traits<_InputIterator1>::value_type>) - __glibcpp_function_requires(_LessThanComparableConcept< + __glibcxx_function_requires(_LessThanComparableConcept< typename iterator_traits<_InputIterator2>::value_type>) for (;__first1 != __last1 && __first2 != __last2; ++__first1, ++__first2) @@ -741,8 +741,8 @@ namespace std _Compare __comp) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>) - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>) + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>) + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>) for ( ; __first1 != __last1 && __first2 != __last2 ; ++__first1, ++__first2) diff --git a/libstdc++-v3/include/bits/stl_bvector.h b/libstdc++-v3/include/bits/stl_bvector.h index 3f6c2a2..755e581 100644 --- a/libstdc++-v3/include/bits/stl_bvector.h +++ b/libstdc++-v3/include/bits/stl_bvector.h @@ -58,8 +58,8 @@ * You should not attempt to use it directly. */ -#ifndef __GLIBCPP_INTERNAL_BVECTOR_H -#define __GLIBCPP_INTERNAL_BVECTOR_H +#ifndef _BVECTOR_H +#define _BVECTOR_H 1 namespace std { @@ -728,7 +728,7 @@ typedef vector<bool, __alloc> bit_vector; } // namespace std -#endif /* __GLIBCPP_INTERNAL_BVECTOR_H */ +#endif /* _BVECTOR_H */ // Local Variables: // mode:C++ diff --git a/libstdc++-v3/include/bits/stl_construct.h b/libstdc++-v3/include/bits/stl_construct.h index 27fb2e4..0884117 100644 --- a/libstdc++-v3/include/bits/stl_construct.h +++ b/libstdc++-v3/include/bits/stl_construct.h @@ -58,8 +58,8 @@ * You should not attempt to use it directly. */ -#ifndef _CPP_BITS_STL_CONSTRUCT_H -#define _CPP_BITS_STL_CONSTRUCT_H 1 +#ifndef _STL_CONSTRUCT_H +#define _STL_CONSTRUCT_H 1 #include <bits/type_traits.h> #include <new> @@ -144,5 +144,5 @@ namespace std } } // namespace std -#endif /* _CPP_BITS_STL_CONSTRUCT_H */ +#endif /* _STL_CONSTRUCT_H */ diff --git a/libstdc++-v3/include/bits/stl_deque.h b/libstdc++-v3/include/bits/stl_deque.h index ef7a725..e474ede 100644 --- a/libstdc++-v3/include/bits/stl_deque.h +++ b/libstdc++-v3/include/bits/stl_deque.h @@ -58,8 +58,8 @@ * You should not attempt to use it directly. */ -#ifndef __GLIBCPP_INTERNAL_DEQUE_H -#define __GLIBCPP_INTERNAL_DEQUE_H +#ifndef _DEQUE_H +#define _DEQUE_H 1 #include <bits/concept_check.h> #include <bits/stl_iterator_base_types.h> @@ -309,7 +309,7 @@ namespace std return !(__x < __y); } - // _GLIBCPP_RESOLVE_LIB_DEFECTS + // _GLIBCXX_RESOLVE_LIB_DEFECTS // According to the resolution of DR179 not only the various comparison // operators but also operator- must accept mixed iterator/const_iterator // parameters. @@ -638,7 +638,7 @@ namespace std class deque : protected _Deque_base<_Tp, _Alloc> { // concept requirements - __glibcpp_class_requires(_Tp, _SGIAssignableConcept) + __glibcxx_class_requires(_Tp, _SGIAssignableConcept) typedef _Deque_base<_Tp, _Alloc> _Base; @@ -1527,4 +1527,4 @@ namespace std } } // namespace std -#endif /* __GLIBCPP_INTERNAL_DEQUE_H */ +#endif /* _DEQUE_H */ diff --git a/libstdc++-v3/include/bits/stl_function.h b/libstdc++-v3/include/bits/stl_function.h index 9ea975d..9051314 100644 --- a/libstdc++-v3/include/bits/stl_function.h +++ b/libstdc++-v3/include/bits/stl_function.h @@ -58,8 +58,8 @@ * You should not attempt to use it directly. */ -#ifndef __GLIBCPP_INTERNAL_FUNCTION_H -#define __GLIBCPP_INTERNAL_FUNCTION_H +#ifndef _FUNCTION_H +#define _FUNCTION_H 1 namespace std { @@ -361,7 +361,7 @@ public: operator()(const typename _Operation::second_argument_type& __x) const { return op(value, __x); } -#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS +#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS //109. Missing binders for non-const sequence elements typename _Operation::result_type operator()(typename _Operation::second_argument_type& __x) const { @@ -395,7 +395,7 @@ public: operator()(const typename _Operation::first_argument_type& __x) const { return op(__x, value); } -#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS +#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS //109. Missing binders for non-const sequence elements typename _Operation::result_type operator()(typename _Operation::first_argument_type& __x) const { @@ -729,7 +729,7 @@ mem_fun_ref(_Ret (_Tp::*__f)(_Arg) const) } // namespace std -#endif /* __GLIBCPP_INTERNAL_FUNCTION_H */ +#endif /* _FUNCTION_H */ // Local Variables: // mode:C++ diff --git a/libstdc++-v3/include/bits/stl_heap.h b/libstdc++-v3/include/bits/stl_heap.h index 8105ff0..ff829a0 100644 --- a/libstdc++-v3/include/bits/stl_heap.h +++ b/libstdc++-v3/include/bits/stl_heap.h @@ -57,8 +57,8 @@ * You should not attempt to use it directly. */ -#ifndef _CPP_BITS_STL_HEAP_H -#define _CPP_BITS_STL_HEAP_H 1 +#ifndef _STL_HEAP_H +#define _STL_HEAP_H 1 namespace std { @@ -89,9 +89,9 @@ namespace std _DistanceType; // concept requirements - __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept< + __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept< _RandomAccessIterator>) - __glibcpp_function_requires(_LessThanComparableConcept<_ValueType>) + __glibcxx_function_requires(_LessThanComparableConcept<_ValueType>) std::__push_heap(__first, _DistanceType((__last - __first) - 1), _DistanceType(0), _ValueType(*(__last - 1))); @@ -123,7 +123,7 @@ namespace std _DistanceType; // concept requirements - __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept< + __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept< _RandomAccessIterator>) std::__push_heap(__first, _DistanceType((__last - __first) - 1), _DistanceType(0), @@ -168,9 +168,9 @@ namespace std typedef typename iterator_traits<_RandomAccessIterator>::value_type _ValueType; // concept requirements - __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept< + __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept< _RandomAccessIterator>) - __glibcpp_function_requires(_LessThanComparableConcept<_ValueType>) + __glibcxx_function_requires(_LessThanComparableConcept<_ValueType>) std::__pop_heap(__first, __last - 1, __last - 1, _ValueType(*(__last - 1))); } @@ -214,7 +214,7 @@ namespace std _RandomAccessIterator __last, _Compare __comp) { // concept requirements - __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept< + __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept< _RandomAccessIterator>) typedef typename iterator_traits<_RandomAccessIterator>::value_type _ValueType; @@ -231,9 +231,9 @@ namespace std _DistanceType; // concept requirements - __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept< + __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept< _RandomAccessIterator>) - __glibcpp_function_requires(_LessThanComparableConcept<_ValueType>) + __glibcxx_function_requires(_LessThanComparableConcept<_ValueType>) if (__last - __first < 2) return; _DistanceType __len = __last - __first; @@ -257,7 +257,7 @@ namespace std _DistanceType; // concept requirements - __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept< + __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept< _RandomAccessIterator>) if (__last - __first < 2) return; @@ -277,9 +277,9 @@ namespace std sort_heap(_RandomAccessIterator __first, _RandomAccessIterator __last) { // concept requirements - __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept< + __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept< _RandomAccessIterator>) - __glibcpp_function_requires(_LessThanComparableConcept< + __glibcxx_function_requires(_LessThanComparableConcept< typename iterator_traits<_RandomAccessIterator>::value_type>) while (__last - __first > 1) @@ -292,7 +292,7 @@ namespace std _Compare __comp) { // concept requirements - __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept< + __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept< _RandomAccessIterator>) while (__last - __first > 1) @@ -301,7 +301,7 @@ namespace std } // namespace std -#endif /* _CPP_BITS_STL_HEAP_H */ +#endif /* _STL_HEAP_H */ // Local Variables: // mode:C++ diff --git a/libstdc++-v3/include/bits/stl_iterator.h b/libstdc++-v3/include/bits/stl_iterator.h index 734ff78..4aa92ff 100644 --- a/libstdc++-v3/include/bits/stl_iterator.h +++ b/libstdc++-v3/include/bits/stl_iterator.h @@ -62,8 +62,8 @@ * supporting functions and overloaded operators. */ -#ifndef __GLIBCPP_INTERNAL_ITERATOR_H -#define __GLIBCPP_INTERNAL_ITERATOR_H +#ifndef _ITERATOR_H +#define _ITERATOR_H 1 namespace std { @@ -109,7 +109,7 @@ namespace std * The default constructor default-initializes member @p current. * If it is a pointer, that means it is zero-initialized. */ - // _GLIBCPP_RESOLVE_LIB_DEFECTS + // _GLIBCXX_RESOLVE_LIB_DEFECTS // 235 No specification of default ctor for reverse_iterator reverse_iterator() : current() { } @@ -722,7 +722,7 @@ namespace __gnu_cxx const __normal_iterator<_Iterator, _Container>& __rhs) { return __lhs.base() >= __rhs.base(); } - // _GLIBCPP_RESOLVE_LIB_DEFECTS + // _GLIBCXX_RESOLVE_LIB_DEFECTS // According to the resolution of DR179 not only the various comparison // operators but also operator- must accept mixed iterator/const_iterator // parameters. diff --git a/libstdc++-v3/include/bits/stl_iterator_base_funcs.h b/libstdc++-v3/include/bits/stl_iterator_base_funcs.h index 53cf234..a1404e1 100644 --- a/libstdc++-v3/include/bits/stl_iterator_base_funcs.h +++ b/libstdc++-v3/include/bits/stl_iterator_base_funcs.h @@ -61,8 +61,8 @@ * functions, such as distance() and advance(). */ -#ifndef __GLIBCPP_INTERNAL_ITERATOR_BASE_FUNCS_H -#define __GLIBCPP_INTERNAL_ITERATOR_BASE_FUNCS_H +#ifndef _ITERATOR_BASE_FUNCS_H +#define _ITERATOR_BASE_FUNCS_H 1 #pragma GCC system_header #include <bits/concept_check.h> @@ -75,7 +75,7 @@ namespace std input_iterator_tag) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>) + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>) typename iterator_traits<_InputIterator>::difference_type __n = 0; while (__first != __last) { @@ -90,7 +90,7 @@ namespace std random_access_iterator_tag) { // concept requirements - __glibcpp_function_requires(_RandomAccessIteratorConcept<_RandomAccessIterator>) + __glibcxx_function_requires(_RandomAccessIteratorConcept<_RandomAccessIterator>) return __last - __first; } @@ -119,7 +119,7 @@ namespace std __advance(_InputIterator& __i, _Distance __n, input_iterator_tag) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>) + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>) while (__n--) ++__i; } @@ -129,7 +129,7 @@ namespace std bidirectional_iterator_tag) { // concept requirements - __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator>) + __glibcxx_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator>) if (__n > 0) while (__n--) ++__i; @@ -143,7 +143,7 @@ namespace std random_access_iterator_tag) { // concept requirements - __glibcpp_function_requires(_RandomAccessIteratorConcept<_RandomAccessIterator>) + __glibcxx_function_requires(_RandomAccessIteratorConcept<_RandomAccessIterator>) __i += __n; } @@ -168,4 +168,4 @@ namespace std } } // namespace std -#endif /* __GLIBCPP_INTERNAL_ITERATOR_BASE_FUNCS_H */ +#endif /* _ITERATOR_BASE_FUNCS_H */ diff --git a/libstdc++-v3/include/bits/stl_iterator_base_types.h b/libstdc++-v3/include/bits/stl_iterator_base_types.h index 8b040e4..373caba 100644 --- a/libstdc++-v3/include/bits/stl_iterator_base_types.h +++ b/libstdc++-v3/include/bits/stl_iterator_base_types.h @@ -61,8 +61,8 @@ * such as iterator_traits and struct iterator. */ -#ifndef __GLIBCPP_INTERNAL_ITERATOR_BASE_TYPES_H -#define __GLIBCPP_INTERNAL_ITERATOR_BASE_TYPES_H +#ifndef _ITERATOR_BASE_TYPES_H +#define _ITERATOR_BASE_TYPES_H 1 #pragma GCC system_header @@ -161,5 +161,5 @@ namespace std } // namespace std -#endif /* __GLIBCPP_INTERNAL_ITERATOR_BASE_TYPES_H */ +#endif /* _ITERATOR_BASE_TYPES_H */ diff --git a/libstdc++-v3/include/bits/stl_list.h b/libstdc++-v3/include/bits/stl_list.h index 0fa7cd2..95fd78e 100644 --- a/libstdc++-v3/include/bits/stl_list.h +++ b/libstdc++-v3/include/bits/stl_list.h @@ -58,8 +58,8 @@ * You should not attempt to use it directly. */ -#ifndef __GLIBCPP_INTERNAL_LIST_H -#define __GLIBCPP_INTERNAL_LIST_H +#ifndef _LIST_H +#define _LIST_H 1 #include <bits/concept_check.h> @@ -366,7 +366,7 @@ namespace std class list : protected _List_base<_Tp, _Alloc> { // concept requirements - __glibcpp_class_requires(_Tp, _SGIAssignableConcept) + __glibcxx_class_requires(_Tp, _SGIAssignableConcept) typedef _List_base<_Tp, _Alloc> _Base; @@ -1108,4 +1108,4 @@ namespace std { __x.swap(__y); } } // namespace std -#endif /* __GLIBCPP_INTERNAL_LIST_H */ +#endif /* _LIST_H */ diff --git a/libstdc++-v3/include/bits/stl_map.h b/libstdc++-v3/include/bits/stl_map.h index 853ef3e..7b15dcc 100644 --- a/libstdc++-v3/include/bits/stl_map.h +++ b/libstdc++-v3/include/bits/stl_map.h @@ -58,8 +58,8 @@ * You should not attempt to use it directly. */ -#ifndef __GLIBCPP_INTERNAL_MAP_H -#define __GLIBCPP_INTERNAL_MAP_H +#ifndef _MAP_H +#define _MAP_H 1 #include <bits/concept_check.h> @@ -91,8 +91,8 @@ namespace std class map { // concept requirements - __glibcpp_class_requires(_Tp, _SGIAssignableConcept) - __glibcpp_class_requires4(_Compare, bool, _Key, _Key, _BinaryFunctionConcept) + __glibcxx_class_requires(_Tp, _SGIAssignableConcept) + __glibcxx_class_requires4(_Compare, bool, _Key, _Key, _BinaryFunctionConcept) public: typedef _Key key_type; @@ -311,7 +311,7 @@ namespace std operator[](const key_type& __k) { // concept requirements - __glibcpp_function_requires(_DefaultConstructibleConcept<mapped_type>) + __glibcxx_function_requires(_DefaultConstructibleConcept<mapped_type>) iterator __i = lower_bound(__k); // __i->first is greater than or equivalent to __k. @@ -655,4 +655,4 @@ namespace std { __x.swap(__y); } } // namespace std -#endif /* __GLIBCPP_INTERNAL_MAP_H */ +#endif /* _MAP_H */ diff --git a/libstdc++-v3/include/bits/stl_multimap.h b/libstdc++-v3/include/bits/stl_multimap.h index f35e3a2..ebc7ff9 100644 --- a/libstdc++-v3/include/bits/stl_multimap.h +++ b/libstdc++-v3/include/bits/stl_multimap.h @@ -58,8 +58,8 @@ * You should not attempt to use it directly. */ -#ifndef __GLIBCPP_INTERNAL_MULTIMAP_H -#define __GLIBCPP_INTERNAL_MULTIMAP_H +#ifndef _MULTIMAP_H +#define _MULTIMAP_H 1 #include <bits/concept_check.h> @@ -105,8 +105,8 @@ namespace std class multimap { // concept requirements - __glibcpp_class_requires(_Tp, _SGIAssignableConcept) - __glibcpp_class_requires4(_Compare, bool, _Key, _Key, _BinaryFunctionConcept) + __glibcxx_class_requires(_Tp, _SGIAssignableConcept) + __glibcxx_class_requires4(_Compare, bool, _Key, _Key, _BinaryFunctionConcept) public: typedef _Key key_type; @@ -634,4 +634,4 @@ namespace std { __x.swap(__y); } } // namespace std -#endif /* __GLIBCPP_INTERNAL_MULTIMAP_H */ +#endif /* _MULTIMAP_H */ diff --git a/libstdc++-v3/include/bits/stl_multiset.h b/libstdc++-v3/include/bits/stl_multiset.h index 9235f8f..7c908e1 100644 --- a/libstdc++-v3/include/bits/stl_multiset.h +++ b/libstdc++-v3/include/bits/stl_multiset.h @@ -58,8 +58,8 @@ * You should not attempt to use it directly. */ -#ifndef __GLIBCPP_INTERNAL_MULTISET_H -#define __GLIBCPP_INTERNAL_MULTISET_H +#ifndef _MULTISET_H +#define _MULTISET_H 1 #include <bits/concept_check.h> @@ -84,8 +84,8 @@ template <class _Key, class _Compare, class _Alloc> class multiset { // concept requirements - __glibcpp_class_requires(_Key, _SGIAssignableConcept) - __glibcpp_class_requires4(_Compare, bool, _Key, _Key, _BinaryFunctionConcept) + __glibcxx_class_requires(_Key, _SGIAssignableConcept) + __glibcxx_class_requires4(_Compare, bool, _Key, _Key, _BinaryFunctionConcept) public: @@ -183,7 +183,7 @@ public: size_type count(const key_type& __x) const { return _M_t.count(__x); } -#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS +#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS //214. set::find() missing const overload iterator find(const key_type& __x) { return _M_t.find(__x); } const_iterator find(const key_type& __x) const { return _M_t.find(__x); } @@ -270,4 +270,4 @@ inline void swap(multiset<_Key,_Compare,_Alloc>& __x, } // namespace std -#endif /* __GLIBCPP_INTERNAL_MULTISET_H */ +#endif /* _MULTISET_H */ diff --git a/libstdc++-v3/include/bits/stl_numeric.h b/libstdc++-v3/include/bits/stl_numeric.h index 53b193b..4aa92ed 100644 --- a/libstdc++-v3/include/bits/stl_numeric.h +++ b/libstdc++-v3/include/bits/stl_numeric.h @@ -58,8 +58,8 @@ * You should not attempt to use it directly. */ -#ifndef _CPP_BITS_STL_NUMERIC_H -#define _CPP_BITS_STL_NUMERIC_H 1 +#ifndef _STL_NUMERIC_H +#define _STL_NUMERIC_H 1 namespace std { @@ -69,7 +69,7 @@ namespace std accumulate(_InputIterator __first, _InputIterator __last, _Tp __init) { // concept requirements - __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>) + __glibcxx_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>) + __glibcxx_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>) + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>) + __glibcxx_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>) + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>) + __glibcxx_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>) + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>) + __glibcxx_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>) + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>) + __glibcxx_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>) + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>) + __glibcxx_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>) + __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>) + __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, _ValueType>) if (__first == __last) return __result; *__result = *__first; @@ -208,4 +208,4 @@ namespace std } // namespace std -#endif /* _CPP_BITS_STL_NUMERIC_H */ +#endif /* _STL_NUMERIC_H */ diff --git a/libstdc++-v3/include/bits/stl_pair.h b/libstdc++-v3/include/bits/stl_pair.h index b0411b2..0d0047f 100644 --- a/libstdc++-v3/include/bits/stl_pair.h +++ b/libstdc++-v3/include/bits/stl_pair.h @@ -58,8 +58,8 @@ * You should not attempt to use it directly. */ -#ifndef __GLIBCPP_INTERNAL_PAIR_H -#define __GLIBCPP_INTERNAL_PAIR_H +#ifndef _PAIR_H +#define _PAIR_H 1 namespace std { @@ -72,7 +72,7 @@ struct pair { _T1 first; ///< @c first is a copy of the first object _T2 second; ///< @c second is a copy of the second object -#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS +#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS //265. std::pair::pair() effects overly restrictive /** The default constructor creates @c first and @c second using their * respective default constructors. */ @@ -138,7 +138,7 @@ inline bool operator>=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { * the LWG by default. */ template <class _T1, class _T2> -#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS +#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS //181. make_pair() unintended behavior inline pair<_T1, _T2> make_pair(_T1 __x, _T2 __y) #else @@ -150,7 +150,7 @@ inline pair<_T1, _T2> make_pair(const _T1& __x, const _T2& __y) } // namespace std -#endif /* __GLIBCPP_INTERNAL_PAIR_H */ +#endif /* _PAIR_H */ // Local Variables: // mode:C++ diff --git a/libstdc++-v3/include/bits/stl_queue.h b/libstdc++-v3/include/bits/stl_queue.h index 38c378c..0bb41ac 100644 --- a/libstdc++-v3/include/bits/stl_queue.h +++ b/libstdc++-v3/include/bits/stl_queue.h @@ -58,8 +58,8 @@ * You should not attempt to use it directly. */ -#ifndef __GLIBCPP_INTERNAL_QUEUE_H -#define __GLIBCPP_INTERNAL_QUEUE_H +#ifndef _QUEUE_H +#define _QUEUE_H 1 #include <bits/concept_check.h> @@ -106,10 +106,10 @@ namespace std { // concept requirements typedef typename _Sequence::value_type _Sequence_value_type; - __glibcpp_class_requires(_Tp, _SGIAssignableConcept) - __glibcpp_class_requires(_Sequence, _FrontInsertionSequenceConcept) - __glibcpp_class_requires(_Sequence, _BackInsertionSequenceConcept) - __glibcpp_class_requires2(_Tp, _Sequence_value_type, _SameTypeConcept) + __glibcxx_class_requires(_Tp, _SGIAssignableConcept) + __glibcxx_class_requires(_Sequence, _FrontInsertionSequenceConcept) + __glibcxx_class_requires(_Sequence, _BackInsertionSequenceConcept) + __glibcxx_class_requires2(_Tp, _Sequence_value_type, _SameTypeConcept) template <typename _Tp1, typename _Seq1> friend bool operator== (const queue<_Tp1, _Seq1>&, @@ -306,11 +306,11 @@ namespace std { // concept requirements typedef typename _Sequence::value_type _Sequence_value_type; - __glibcpp_class_requires(_Tp, _SGIAssignableConcept) - __glibcpp_class_requires(_Sequence, _SequenceConcept) - __glibcpp_class_requires(_Sequence, _RandomAccessContainerConcept) - __glibcpp_class_requires2(_Tp, _Sequence_value_type, _SameTypeConcept) - __glibcpp_class_requires4(_Compare, bool, _Tp, _Tp, _BinaryFunctionConcept) + __glibcxx_class_requires(_Tp, _SGIAssignableConcept) + __glibcxx_class_requires(_Sequence, _SequenceConcept) + __glibcxx_class_requires(_Sequence, _RandomAccessContainerConcept) + __glibcxx_class_requires2(_Tp, _Sequence_value_type, _SameTypeConcept) + __glibcxx_class_requires4(_Compare, bool, _Tp, _Tp, _BinaryFunctionConcept) public: typedef typename _Sequence::value_type value_type; @@ -427,4 +427,4 @@ namespace std // No equality/comparison operators are provided for priority_queue. } // namespace std -#endif /* __GLIBCPP_INTERNAL_QUEUE_H */ +#endif /* _QUEUE_H */ diff --git a/libstdc++-v3/include/bits/stl_raw_storage_iter.h b/libstdc++-v3/include/bits/stl_raw_storage_iter.h index c4ff669..3460205 100644 --- a/libstdc++-v3/include/bits/stl_raw_storage_iter.h +++ b/libstdc++-v3/include/bits/stl_raw_storage_iter.h @@ -58,8 +58,8 @@ * You should not attempt to use it directly. */ -#ifndef _CPP_BITS_STL_RAW_STORAGE_ITERATOR_H -#define _CPP_BITS_STL_RAW_STORAGE_ITERATOR_H 1 +#ifndef _STL_RAW_STORAGE_ITERATOR_H +#define _STL_RAW_STORAGE_ITERATOR_H 1 namespace std { diff --git a/libstdc++-v3/include/bits/stl_relops.h b/libstdc++-v3/include/bits/stl_relops.h index a8a3a17..18561ec 100644 --- a/libstdc++-v3/include/bits/stl_relops.h +++ b/libstdc++-v3/include/bits/stl_relops.h @@ -68,8 +68,8 @@ * @endif */ -#ifndef _CPP_BITS_STL_RELOPS_H -#define _CPP_BITS_STL_RELOPS_H 1 +#ifndef _STL_RELOPS_H +#define _STL_RELOPS_H 1 namespace std { @@ -134,4 +134,4 @@ inline bool operator>=(const _Tp& __x, const _Tp& __y) { } // namespace rel_ops } // namespace std -#endif /* _CPP_BITS_STL_RELOPS_H */ +#endif /* _STL_RELOPS_H */ diff --git a/libstdc++-v3/include/bits/stl_set.h b/libstdc++-v3/include/bits/stl_set.h index 96dc4b3..3c47760 100644 --- a/libstdc++-v3/include/bits/stl_set.h +++ b/libstdc++-v3/include/bits/stl_set.h @@ -58,8 +58,8 @@ * You should not attempt to use it directly. */ -#ifndef __GLIBCPP_INTERNAL_SET_H -#define __GLIBCPP_INTERNAL_SET_H +#ifndef _SET_H +#define _SET_H 1 #include <bits/concept_check.h> @@ -85,8 +85,8 @@ template <class _Key, class _Compare, class _Alloc> class set { // concept requirements - __glibcpp_class_requires(_Key, _SGIAssignableConcept) - __glibcpp_class_requires4(_Compare, bool, _Key, _Key, _BinaryFunctionConcept) + __glibcxx_class_requires(_Key, _SGIAssignableConcept) + __glibcxx_class_requires4(_Compare, bool, _Key, _Key, _BinaryFunctionConcept) public: // typedefs: @@ -182,7 +182,7 @@ public: return _M_t.find(__x) == _M_t.end() ? 0 : 1; } -#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS +#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS //214. set::find() missing const overload iterator find(const key_type& __x) { return _M_t.find(__x); } const_iterator find(const key_type& __x) const { return _M_t.find(__x); } @@ -267,4 +267,4 @@ inline void swap(set<_Key,_Compare,_Alloc>& __x, } // namespace std -#endif /* __GLIBCPP_INTERNAL_SET_H */ +#endif /* _SET_H */ diff --git a/libstdc++-v3/include/bits/stl_stack.h b/libstdc++-v3/include/bits/stl_stack.h index 54b3e15..b9847ce 100644 --- a/libstdc++-v3/include/bits/stl_stack.h +++ b/libstdc++-v3/include/bits/stl_stack.h @@ -58,8 +58,8 @@ * You should not attempt to use it directly. */ -#ifndef __GLIBCPP_INTERNAL_STACK_H -#define __GLIBCPP_INTERNAL_STACK_H +#ifndef _STACK_H +#define _STACK_H 1 #include <bits/concept_check.h> @@ -107,9 +107,9 @@ namespace std { // concept requirements typedef typename _Sequence::value_type _Sequence_value_type; - __glibcpp_class_requires(_Tp, _SGIAssignableConcept) - __glibcpp_class_requires(_Sequence, _BackInsertionSequenceConcept) - __glibcpp_class_requires2(_Tp, _Sequence_value_type, _SameTypeConcept) + __glibcxx_class_requires(_Tp, _SGIAssignableConcept) + __glibcxx_class_requires(_Sequence, _BackInsertionSequenceConcept) + __glibcxx_class_requires2(_Tp, _Sequence_value_type, _SameTypeConcept) template <typename _Tp1, typename _Seq1> friend bool operator== (const stack<_Tp1, _Seq1>&, @@ -247,4 +247,4 @@ namespace std { return !(__x < __y); } } // namespace std -#endif /* __GLIBCPP_INTERNAL_STACK_H */ +#endif /* _STACK_H */ diff --git a/libstdc++-v3/include/bits/stl_tempbuf.h b/libstdc++-v3/include/bits/stl_tempbuf.h index 4f90402..1fa5afc 100644 --- a/libstdc++-v3/include/bits/stl_tempbuf.h +++ b/libstdc++-v3/include/bits/stl_tempbuf.h @@ -58,8 +58,8 @@ * You should not attempt to use it directly. */ -#ifndef __GLIBCPP_INTERNAL_TEMPBUF_H -#define __GLIBCPP_INTERNAL_TEMPBUF_H +#ifndef _TEMPBUF_H +#define _TEMPBUF_H 1 namespace std { @@ -75,7 +75,7 @@ template <class _ForwardIterator, class _Tp> class _Temporary_buffer { // concept requirements - __glibcpp_class_requires(_ForwardIterator, _ForwardIteratorConcept) + __glibcxx_class_requires(_ForwardIterator, _ForwardIteratorConcept) ptrdiff_t _M_original_len; ptrdiff_t _M_len; @@ -145,5 +145,5 @@ private: } // namespace std -#endif /* __GLIBCPP_INTERNAL_TEMPBUF_H */ +#endif /* _TEMPBUF_H */ diff --git a/libstdc++-v3/include/bits/stl_threads.h b/libstdc++-v3/include/bits/stl_threads.h index 1ae7537..65407ce 100644 --- a/libstdc++-v3/include/bits/stl_threads.h +++ b/libstdc++-v3/include/bits/stl_threads.h @@ -45,8 +45,8 @@ * You should not attempt to use it directly. */ -#ifndef __SGI_STL_INTERNAL_THREADS_H -#define __SGI_STL_INTERNAL_THREADS_H +#ifndef _STL_THREADS_H +#define _STL_THREADS_H 1 #include <cstddef> @@ -117,11 +117,11 @@ namespace std #if !defined(__GTHREAD_MUTEX_INIT) && defined(__GTHREAD_MUTEX_INIT_FUNCTION) namespace __gnu_cxx { - extern __gthread_mutex_t _GLIBCPP_mutex; - extern __gthread_mutex_t *_GLIBCPP_mutex_address; - extern __gthread_once_t _GLIBCPP_once; - extern void _GLIBCPP_mutex_init (void); - extern void _GLIBCPP_mutex_address_init (void); + extern __gthread_mutex_t _GLIBCXX_mutex; + extern __gthread_mutex_t *_GLIBCXX_mutex_address; + extern __gthread_once_t _GLIBCXX_once; + extern void _GLIBCXX_mutex_init (void); + extern void _GLIBCXX_mutex_address_init (void); } #endif @@ -143,24 +143,24 @@ namespace std // There should be no code in this path given the usage rules above. #elif defined(__GTHREAD_MUTEX_INIT_FUNCTION) if (_M_init_flag) return; - if (__gthread_once (&__gnu_cxx::_GLIBCPP_once, - __gnu_cxx::_GLIBCPP_mutex_init) != 0 + if (__gthread_once (&__gnu_cxx::_GLIBCXX_once, + __gnu_cxx::_GLIBCXX_mutex_init) != 0 && __gthread_active_p ()) abort (); - __gthread_mutex_lock (&__gnu_cxx::_GLIBCPP_mutex); + __gthread_mutex_lock (&__gnu_cxx::_GLIBCXX_mutex); if (!_M_init_flag) { // Even though we have a global lock, we use __gthread_once to be // absolutely certain the _M_lock mutex is only initialized once on // multiprocessor systems. - __gnu_cxx::_GLIBCPP_mutex_address = &_M_lock; + __gnu_cxx::_GLIBCXX_mutex_address = &_M_lock; if (__gthread_once (&_M_once, - __gnu_cxx::_GLIBCPP_mutex_address_init) != 0 + __gnu_cxx::_GLIBCXX_mutex_address_init) != 0 && __gthread_active_p ()) abort (); _M_init_flag = 1; } - __gthread_mutex_unlock (&__gnu_cxx::_GLIBCPP_mutex); + __gthread_mutex_unlock (&__gnu_cxx::_GLIBCXX_mutex); #endif } diff --git a/libstdc++-v3/include/bits/stl_tree.h b/libstdc++-v3/include/bits/stl_tree.h index 33c8ebd..2172c98 100644 --- a/libstdc++-v3/include/bits/stl_tree.h +++ b/libstdc++-v3/include/bits/stl_tree.h @@ -60,8 +60,8 @@ * You should not attempt to use it directly. */ -#ifndef __GLIBCPP_INTERNAL_TREE_H -#define __GLIBCPP_INTERNAL_TREE_H +#ifndef _TREE_H +#define _TREE_H 1 /* diff --git a/libstdc++-v3/include/bits/stl_uninitialized.h b/libstdc++-v3/include/bits/stl_uninitialized.h index e2106e0..e60e24a 100644 --- a/libstdc++-v3/include/bits/stl_uninitialized.h +++ b/libstdc++-v3/include/bits/stl_uninitialized.h @@ -58,8 +58,8 @@ * You should not attempt to use it directly. */ -#ifndef _CPP_BITS_STL_UNINITIALIZED_H -#define _CPP_BITS_STL_UNINITIALIZED_H 1 +#ifndef _STL_UNINITIALIZED_H +#define _STL_UNINITIALIZED_H 1 #include <cstring> @@ -283,4 +283,4 @@ namespace std } // namespace std -#endif /* _CPP_BITS_STL_UNINITIALIZED_H */ +#endif /* _STL_UNINITIALIZED_H */ diff --git a/libstdc++-v3/include/bits/stl_vector.h b/libstdc++-v3/include/bits/stl_vector.h index 91a6d9b..43d2821 100644 --- a/libstdc++-v3/include/bits/stl_vector.h +++ b/libstdc++-v3/include/bits/stl_vector.h @@ -58,8 +58,8 @@ * You should not attempt to use it directly. */ -#ifndef __GLIBCPP_INTERNAL_VECTOR_H -#define __GLIBCPP_INTERNAL_VECTOR_H +#ifndef _VECTOR_H +#define _VECTOR_H 1 #include <bits/stl_iterator_base_funcs.h> #include <bits/functexcept.h> @@ -186,7 +186,7 @@ namespace std class vector : protected _Vector_base<_Tp, _Alloc> { // Concept requirements. - __glibcpp_class_requires(_Tp, _SGIAssignableConcept) + __glibcxx_class_requires(_Tp, _SGIAssignableConcept) typedef _Vector_base<_Tp, _Alloc> _Base; typedef vector<_Tp, _Alloc> vector_type; @@ -968,4 +968,4 @@ namespace std { __x.swap(__y); } } // namespace std -#endif /* __GLIBCPP_INTERNAL_VECTOR_H */ +#endif /* _VECTOR_H */ diff --git a/libstdc++-v3/include/bits/stream_iterator.h b/libstdc++-v3/include/bits/stream_iterator.h index 4897fc3..dcbf9f0 100644 --- a/libstdc++-v3/include/bits/stream_iterator.h +++ b/libstdc++-v3/include/bits/stream_iterator.h @@ -32,8 +32,8 @@ * You should not attempt to use it directly. */ -#ifndef _CPP_BITS_STREAM_ITERATOR_H -#define _CPP_BITS_STREAM_ITERATOR_H 1 +#ifndef _STREAM_ITERATOR_H +#define _STREAM_ITERATOR_H 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/bits/streambuf.tcc b/libstdc++-v3/include/bits/streambuf.tcc index a16169a..2fac350 100644 --- a/libstdc++-v3/include/bits/streambuf.tcc +++ b/libstdc++-v3/include/bits/streambuf.tcc @@ -32,8 +32,8 @@ // ISO C++ 14882: 27.5 Stream buffers // -#ifndef _CPP_BITS_STREAMBUF_TCC -#define _CPP_BITS_STREAMBUF_TCC 1 +#ifndef _STREAMBUF_TCC +#define _STREAMBUF_TCC 1 #pragma GCC system_header @@ -156,14 +156,14 @@ namespace std // Inhibit implicit instantiations for required instantiations, // which are defined via explicit instantiations elsewhere. // NB: This syntax is a GNU extension. -#if _GLIBCPP_EXTERN_TEMPLATE +#if _GLIBCXX_EXTERN_TEMPLATE extern template class basic_streambuf<char>; extern template streamsize __copy_streambufs(basic_ios<char>&, basic_streambuf<char>*, basic_streambuf<char>*); -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T extern template class basic_streambuf<wchar_t>; extern template streamsize diff --git a/libstdc++-v3/include/bits/streambuf_iterator.h b/libstdc++-v3/include/bits/streambuf_iterator.h index 95def0b..f25cd4f 100644 --- a/libstdc++-v3/include/bits/streambuf_iterator.h +++ b/libstdc++-v3/include/bits/streambuf_iterator.h @@ -33,8 +33,8 @@ * You should not attempt to use it directly. */ -#ifndef _CPP_BITS_STREAMBUF_ITERATOR_H -#define _CPP_BITS_STREAMBUF_ITERATOR_H 1 +#ifndef _STREAMBUF_ITERATOR_H +#define _STREAMBUF_ITERATOR_H 1 #pragma GCC system_header @@ -109,7 +109,7 @@ namespace std return __old; } -#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS +#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS // 110 istreambuf_iterator::equal not const // NB: there is also number 111 (NAD, Future) pending on this function. bool diff --git a/libstdc++-v3/include/bits/stringfwd.h b/libstdc++-v3/include/bits/stringfwd.h index db40bef..7577580 100644 --- a/libstdc++-v3/include/bits/stringfwd.h +++ b/libstdc++-v3/include/bits/stringfwd.h @@ -36,8 +36,8 @@ * You should not attempt to use it directly. */ -#ifndef _CPP_BITS_STRINGFWD_H -#define _CPP_BITS_STRINGFWD_H 1 +#ifndef _STRINGFWD_H +#define _STRINGFWD_H 1 #pragma GCC system_header @@ -59,11 +59,11 @@ namespace std typedef basic_string<char> string; -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T template<> struct char_traits<wchar_t>; typedef basic_string<wchar_t> wstring; #endif } // namespace std -#endif // _CPP_BITS_STRINGFWD_H +#endif // _STRINGFWD_H diff --git a/libstdc++-v3/include/bits/type_traits.h b/libstdc++-v3/include/bits/type_traits.h index 61bc436..80f7e39 100644 --- a/libstdc++-v3/include/bits/type_traits.h +++ b/libstdc++-v3/include/bits/type_traits.h @@ -46,8 +46,8 @@ * You should not attempt to use it directly. */ -#ifndef _CPP_BITS_TYPE_TRAITS_H -#define _CPP_BITS_TYPE_TRAITS_H 1 +#ifndef _TYPE_TRAITS_H +#define _TYPE_TRAITS_H 1 #pragma GCC system_header @@ -332,7 +332,7 @@ struct _Is_normal_iterator< __gnu_cxx::__normal_iterator<_Iterator, _Container> typedef __true_type _Normal; }; -#endif /* _CPP_BITS_TYPE_TRAITS_H */ +#endif /* _TYPE_TRAITS_H */ // Local Variables: // mode:C++ diff --git a/libstdc++-v3/include/bits/valarray_after.h b/libstdc++-v3/include/bits/valarray_after.h index 687e6d2..2506a4b 100644 --- a/libstdc++-v3/include/bits/valarray_after.h +++ b/libstdc++-v3/include/bits/valarray_after.h @@ -34,8 +34,8 @@ * You should not attempt to use it directly. */ -#ifndef _CPP_VALARRAY_AFTER_H -#define _CPP_VALARRAY_AFTER_H 1 +#ifndef _VALARRAY_AFTER_H +#define _VALARRAY_AFTER_H 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/bits/valarray_array.h b/libstdc++-v3/include/bits/valarray_array.h index 68aec24..3b14f1d 100644 --- a/libstdc++-v3/include/bits/valarray_array.h +++ b/libstdc++-v3/include/bits/valarray_array.h @@ -34,8 +34,8 @@ * You should not attempt to use it directly. */ -#ifndef _CPP_BITS_ARRAY_H -#define _CPP_BITS_ARRAY_H 1 +#ifndef _VALARRAY_ARRAY_H +#define _VALARRAY_ARRAY_H 1 #pragma GCC system_header @@ -618,12 +618,12 @@ _Array_augmented_##_Name (_Array<_Tp> __a, _Array<bool> __m, \ } // std:: -#ifdef _GLIBCPP_NO_TEMPLATE_EXPORT +#ifdef _GLIBCXX_NO_TEMPLATE_EXPORT # define export # include <bits/valarray_array.tcc> #endif -#endif /* _CPP_BITS_ARRAY_H */ +#endif /* _ARRAY_H */ // Local Variables: // mode:c++ diff --git a/libstdc++-v3/include/bits/valarray_array.tcc b/libstdc++-v3/include/bits/valarray_array.tcc index ba4b083..acf21a0 100644 --- a/libstdc++-v3/include/bits/valarray_array.tcc +++ b/libstdc++-v3/include/bits/valarray_array.tcc @@ -29,8 +29,8 @@ // Written by Gabriel Dos Reis <Gabriel.Dos-Reis@DPTMaths.ENS-Cachan.Fr> -#ifndef _CPP_BITS_VALARRAY_ARRAY_TCC -#define _CPP_BITS_VALARRAY_ARRAY_TCC 1 +#ifndef _VALARRAY_ARRAY_TCC +#define _VALARRAY_ARRAY_TCC 1 namespace std { @@ -52,7 +52,7 @@ __valarray_fill (_Array<_Tp> __a, size_t __n, _Array<bool> __m, const _Tp& __t) export template<typename _Tp> void -__valarray_copy (_Array<_Tp> __a, _Array<bool> __m, _Array<_Tp> __b, size_t __n) +__valarray_copy(_Array<_Tp> __a, _Array<bool> __m, _Array<_Tp> __b, size_t __n) { _Tp* __p (__a._M_data); bool* __ok (__m._M_data); @@ -154,7 +154,7 @@ __valarray_copy_construct (_Array<_Tp> __a, _Array<bool> __m, } // std:: -#endif /* _CPP_BITS_VALARRAY_ARRAY_TCC */ +#endif /* _VALARRAY_ARRAY_TCC */ // Local Variables: // mode:c++ diff --git a/libstdc++-v3/include/bits/valarray_before.h b/libstdc++-v3/include/bits/valarray_before.h index 7a0b677..775d150 100644 --- a/libstdc++-v3/include/bits/valarray_before.h +++ b/libstdc++-v3/include/bits/valarray_before.h @@ -34,8 +34,8 @@ * You should not attempt to use it directly. */ -#ifndef _CPP_VALARRAY_BEFORE_H -#define _CPP_VALARRAY_BEFORE_H 1 +#ifndef _VALARRAY_BEFORE_H +#define _VALARRAY_BEFORE_H 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/bits/vector.tcc b/libstdc++-v3/include/bits/vector.tcc index e5fdea8..7e65c4d 100644 --- a/libstdc++-v3/include/bits/vector.tcc +++ b/libstdc++-v3/include/bits/vector.tcc @@ -58,8 +58,8 @@ * You should not attempt to use it directly. */ -#ifndef __GLIBCPP_INTERNAL_VECTOR_TCC -#define __GLIBCPP_INTERNAL_VECTOR_TCC +#ifndef _VECTOR_TCC +#define _VECTOR_TCC 1 namespace std { @@ -269,7 +269,7 @@ namespace std } } - #ifdef _GLIBCPP_DEPRECATED + #ifdef _GLIBCXX_DEPRECATED template<typename _Tp, typename _Alloc> void vector<_Tp,_Alloc>:: @@ -454,4 +454,4 @@ namespace std } } // namespace std -#endif /* __GLIBCPP_INTERNAL_VECTOR_TCC */ +#endif /* _VECTOR_TCC */ |