diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a0c6a8ad19fc..fcbbee7f0ea4 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,52 @@ +2003-07-23 Steve Ellcey + + * include/c_std/cmath.tcc: Use _GLIBCXX_ prefix on file guard. + * include/c_std/std_cctype.h: Ditto. + * include/c_std/std_cerrno.h: Ditto. + * include/c_std/std_cfloat.h: Ditto. + * include/c_std/std_climits.h: Ditto. + * include/c_std/std_clocale.h: Ditto. + * include/c_std/std_cmath.h: Ditto. + * include/c_std/std_csetjmp.h: Ditto. + * include/c_std/std_csignal.h: Ditto. + * include/c_std/std_cstdarg.h: Ditto. + * include/c_std/std_cstddef.h: Ditto. + * include/c_std/std_cstdio.h: Ditto. + * include/c_std/std_cstdlib.h: Ditto. + * include/c_std/std_cstring.h: Ditto. + * include/c_std/std_ctime.h: Ditto. + * include/c_std/std_cwchar.h: Ditto. + * include/c_std/std_cwctype.h: Ditto. + * include/std/std_algorithm.h: Ditto. + * include/std/std_bitset.h: Ditto. + * include/std/std_complex.h: Ditto. + * include/std/std_deque.h: Ditto. + * include/std/std_fstream.h: Ditto. + * include/std/std_functional.h: Ditto. + * include/std/std_iomanip.h: Ditto. + * include/std/std_ios.h: Ditto. + * include/std/std_iosfwd.h: Ditto. + * include/std/std_iostream.h: Ditto. + * include/std/std_istream.h: Ditto. + * include/std/std_iterator.h: Ditto. + * include/std/std_limits.h: Ditto. + * include/std/std_list.h: Ditto. + * include/std/std_locale.h: Ditto. + * include/std/std_map.h: Ditto. + * include/std/std_memory.h: Ditto. + * include/std/std_numeric.h: Ditto. + * include/std/std_ostream.h: Ditto. + * include/std/std_queue.h: Ditto. + * include/std/std_set.h: Ditto. + * include/std/std_sstream.h: Ditto. + * include/std/std_stack.h: Ditto. + * include/std/std_stdexcept.h: Ditto. + * include/std/std_streambuf.h: Ditto. + * include/std/std_string.h: Ditto. + * include/std/std_utility.h: Ditto. + * include/std/std_valarray.h: Ditto. + * include/std/std_vector.h: Ditto. + 2003-07-22 Doug Gregor * include/bits/basic_string.h (basic_string::insert): Deprecate diff --git a/libstdc++-v3/include/c_std/cmath.tcc b/libstdc++-v3/include/c_std/cmath.tcc index be7502d3c463..2132548e31f8 100644 --- a/libstdc++-v3/include/c_std/cmath.tcc +++ b/libstdc++-v3/include/c_std/cmath.tcc @@ -29,8 +29,8 @@ // This file was written by Gabriel Dos Reis -#ifndef _CMATH_TCC -#define _CMATH_TCC 1 +#ifndef _GLIBCXX_CMATH_TCC +#define _GLIBCXX_CMATH_TCC 1 namespace std { diff --git a/libstdc++-v3/include/c_std/std_cctype.h b/libstdc++-v3/include/c_std/std_cctype.h index 8b903eaf76ac..02978622d828 100644 --- a/libstdc++-v3/include/c_std/std_cctype.h +++ b/libstdc++-v3/include/c_std/std_cctype.h @@ -40,8 +40,8 @@ * contained in the namespace @c std. */ -#ifndef _CCTYPE -#define _CCTYPE 1 +#ifndef _GLIBCXX_CCTYPE +#define _GLIBCXX_CCTYPE 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c_std/std_cerrno.h b/libstdc++-v3/include/c_std/std_cerrno.h index b9a0743e79a2..7915e14ba270 100644 --- a/libstdc++-v3/include/c_std/std_cerrno.h +++ b/libstdc++-v3/include/c_std/std_cerrno.h @@ -40,8 +40,8 @@ * contained in the namespace @c std. */ -#ifndef _CERRNO -#define _CERRNO 1 +#ifndef _GLIBCXX_CERRNO +#define _GLIBCXX_CERRNO 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c_std/std_cfloat.h b/libstdc++-v3/include/c_std/std_cfloat.h index ab7283e7802a..4c5bb00f2042 100644 --- a/libstdc++-v3/include/c_std/std_cfloat.h +++ b/libstdc++-v3/include/c_std/std_cfloat.h @@ -40,8 +40,8 @@ * contained in the namespace @c std. */ -#ifndef _CFLOAT -#define _CFLOAT 1 +#ifndef _GLIBCXX_CFLOAT +#define _GLIBCXX_CFLOAT 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c_std/std_climits.h b/libstdc++-v3/include/c_std/std_climits.h index 7f2b0125f236..f4e1d8f77fa8 100644 --- a/libstdc++-v3/include/c_std/std_climits.h +++ b/libstdc++-v3/include/c_std/std_climits.h @@ -41,8 +41,8 @@ * contained in the namespace @c std. */ -#ifndef _CLIMITS -#define _CLIMITS 1 +#ifndef _GLIBCXX_CLIMITS +#define _GLIBCXX_CLIMITS 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c_std/std_clocale.h b/libstdc++-v3/include/c_std/std_clocale.h index c6a882b6fe10..988b84924af5 100644 --- a/libstdc++-v3/include/c_std/std_clocale.h +++ b/libstdc++-v3/include/c_std/std_clocale.h @@ -41,8 +41,8 @@ * contained in the namespace @c std. */ -#ifndef _CLOCALE -#define _CLOCALE 1 +#ifndef _GLIBCXX_CLOCALE +#define _GLIBCXX_CLOCALE 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c_std/std_cmath.h b/libstdc++-v3/include/c_std/std_cmath.h index b34e172167cc..d6c72e474f56 100644 --- a/libstdc++-v3/include/c_std/std_cmath.h +++ b/libstdc++-v3/include/c_std/std_cmath.h @@ -41,8 +41,8 @@ * contained in the namespace @c std. */ -#ifndef _CMATH -#define _CMATH 1 +#ifndef _GLIBCXX_CMATH +#define _GLIBCXX_CMATH 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c_std/std_csetjmp.h b/libstdc++-v3/include/c_std/std_csetjmp.h index c5b9119e0b85..d5fe073f0fc5 100644 --- a/libstdc++-v3/include/c_std/std_csetjmp.h +++ b/libstdc++-v3/include/c_std/std_csetjmp.h @@ -41,8 +41,8 @@ * contained in the namespace @c std. */ -#ifndef _CSETJMP -#define _CSETJMP 1 +#ifndef _GLIBCXX_CSETJMP +#define _GLIBCXX_CSETJMP 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c_std/std_csignal.h b/libstdc++-v3/include/c_std/std_csignal.h index 8be03f05f4cd..5734cf6d29a4 100644 --- a/libstdc++-v3/include/c_std/std_csignal.h +++ b/libstdc++-v3/include/c_std/std_csignal.h @@ -41,8 +41,8 @@ * contained in the namespace @c std. */ -#ifndef _CSIGNAL -#define _CSIGNAL 1 +#ifndef _GLIBCXX_CSIGNAL +#define _GLIBCXX_CSIGNAL 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c_std/std_cstdarg.h b/libstdc++-v3/include/c_std/std_cstdarg.h index 52979dffa6cc..ca362e4b412f 100644 --- a/libstdc++-v3/include/c_std/std_cstdarg.h +++ b/libstdc++-v3/include/c_std/std_cstdarg.h @@ -40,8 +40,8 @@ * contained in the namespace @c std. */ -#ifndef _CSTDARG -#define _CSTDARG 1 +#ifndef _GLIBCXX_CSTDARG +#define _GLIBCXX_CSTDARG 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c_std/std_cstddef.h b/libstdc++-v3/include/c_std/std_cstddef.h index b7e56100196b..a171c5a97655 100644 --- a/libstdc++-v3/include/c_std/std_cstddef.h +++ b/libstdc++-v3/include/c_std/std_cstddef.h @@ -40,8 +40,8 @@ * contained in the namespace @c std. */ -#ifndef _CSTDDEF -#define _CSTDDEF 1 +#ifndef _GLIBCXX_CSTDDEF +#define _GLIBCXX_CSTDDEF 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c_std/std_cstdio.h b/libstdc++-v3/include/c_std/std_cstdio.h index 732da5f9461b..331dc15b0f7c 100644 --- a/libstdc++-v3/include/c_std/std_cstdio.h +++ b/libstdc++-v3/include/c_std/std_cstdio.h @@ -41,8 +41,8 @@ * contained in the namespace @c std. */ -#ifndef _CSTDIO -#define _CSTDIO 1 +#ifndef _GLIBCXX_CSTDIO +#define _GLIBCXX_CSTDIO 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c_std/std_cstdlib.h b/libstdc++-v3/include/c_std/std_cstdlib.h index 5cac120edfd5..c942efb8a62c 100644 --- a/libstdc++-v3/include/c_std/std_cstdlib.h +++ b/libstdc++-v3/include/c_std/std_cstdlib.h @@ -41,8 +41,8 @@ * contained in the namespace @c std. */ -#ifndef _CSTDLIB -#define _CSTDLIB 1 +#ifndef _GLIBCXX_CSTDLIB +#define _GLIBCXX_CSTDLIB 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c_std/std_cstring.h b/libstdc++-v3/include/c_std/std_cstring.h index 934e491def64..4436db692405 100644 --- a/libstdc++-v3/include/c_std/std_cstring.h +++ b/libstdc++-v3/include/c_std/std_cstring.h @@ -41,8 +41,8 @@ * contained in the namespace @c std. */ -#ifndef _CSTRING -#define _CSTRING 1 +#ifndef _GLIBCXX_CSTRING +#define _GLIBCXX_CSTRING 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c_std/std_ctime.h b/libstdc++-v3/include/c_std/std_ctime.h index b7ed90698a23..fe890dfd580c 100644 --- a/libstdc++-v3/include/c_std/std_ctime.h +++ b/libstdc++-v3/include/c_std/std_ctime.h @@ -41,8 +41,8 @@ * contained in the namespace @c std. */ -#ifndef _CTIME -#define _CTIME 1 +#ifndef _GLIBCXX_CTIME +#define _GLIBCXX_CTIME 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c_std/std_cwchar.h b/libstdc++-v3/include/c_std/std_cwchar.h index b9e0965ce8e0..8a20a7128628 100644 --- a/libstdc++-v3/include/c_std/std_cwchar.h +++ b/libstdc++-v3/include/c_std/std_cwchar.h @@ -41,8 +41,8 @@ * contained in the namespace @c std. */ -#ifndef _CWCHAR -#define _CWCHAR 1 +#ifndef _GLIBCXX_CWCHAR +#define _GLIBCXX_CWCHAR 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c_std/std_cwctype.h b/libstdc++-v3/include/c_std/std_cwctype.h index f7639ed38430..fbd2eabdbcd8 100644 --- a/libstdc++-v3/include/c_std/std_cwctype.h +++ b/libstdc++-v3/include/c_std/std_cwctype.h @@ -41,8 +41,8 @@ * contained in the namespace @c std. */ -#ifndef _CWCTYPE -#define _CWCTYPE 1 +#ifndef _GLIBCXX_CWCTYPE +#define _GLIBCXX_CWCTYPE 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/std/std_algorithm.h b/libstdc++-v3/include/std/std_algorithm.h index c7837b4fdb53..1d81201bc7db 100644 --- a/libstdc++-v3/include/std/std_algorithm.h +++ b/libstdc++-v3/include/std/std_algorithm.h @@ -58,8 +58,8 @@ * in your programs, rather than any of the "st[dl]_*.h" implementation files. */ -#ifndef _ALGORITHM -#define _ALGORITHM 1 +#ifndef _GLIBCXX_ALGORITHM +#define _GLIBCXX_ALGORITHM 1 #pragma GCC system_header @@ -68,7 +68,7 @@ #include #include -#endif /* _ALGORITHM */ +#endif /* _GLIBCXX_ALGORITHM */ // Local Variables: // mode:C++ diff --git a/libstdc++-v3/include/std/std_bitset.h b/libstdc++-v3/include/std/std_bitset.h index 66ba29540204..ab4ca236bd7f 100644 --- a/libstdc++-v3/include/std/std_bitset.h +++ b/libstdc++-v3/include/std/std_bitset.h @@ -45,8 +45,8 @@ * in your programs, rather than any of the "st[dl]_*.h" implementation files. */ -#ifndef _BITSET -#define _BITSET 1 +#ifndef _GLIBCXX_BITSET +#define _GLIBCXX_BITSET 1 #pragma GCC system_header @@ -1212,4 +1212,4 @@ namespace std #undef _GLIBCXX_BITSET_WORDS #undef _GLIBCXX_BITSET_BITS_PER_WORD -#endif /* _BITSET */ +#endif /* _GLIBCXX_BITSET */ diff --git a/libstdc++-v3/include/std/std_complex.h b/libstdc++-v3/include/std/std_complex.h index 94c30a2cde68..4978d5a8f153 100644 --- a/libstdc++-v3/include/std/std_complex.h +++ b/libstdc++-v3/include/std/std_complex.h @@ -40,8 +40,8 @@ * in your programs, rather than any of the "st[dl]_*.h" implementation files. */ -#ifndef _COMPLEX -#define _COMPLEX 1 +#ifndef _GLIBCXX_COMPLEX +#define _GLIBCXX_COMPLEX 1 #pragma GCC system_header @@ -1062,4 +1062,4 @@ namespace std : _M_value(_ComplexT(__z._M_value)) { } } // namespace std -#endif /* _COMPLEX */ +#endif /* _GLIBCXX_COMPLEX */ diff --git a/libstdc++-v3/include/std/std_deque.h b/libstdc++-v3/include/std/std_deque.h index 588c7c5576fd..7ebf9c71a5bd 100644 --- a/libstdc++-v3/include/std/std_deque.h +++ b/libstdc++-v3/include/std/std_deque.h @@ -58,8 +58,8 @@ * in your programs, rather than any of the "st[dl]_*.h" implementation files. */ -#ifndef _DEQUE -#define _DEQUE 1 +#ifndef _GLIBCXX_DEQUE +#define _GLIBCXX_DEQUE 1 #pragma GCC system_header @@ -74,5 +74,4 @@ # include #endif -#endif /* _DEQUE */ - +#endif /* _GLIBCXX_DEQUE */ diff --git a/libstdc++-v3/include/std/std_fstream.h b/libstdc++-v3/include/std/std_fstream.h index ca4171c89ba1..4d1d655f1b16 100644 --- a/libstdc++-v3/include/std/std_fstream.h +++ b/libstdc++-v3/include/std/std_fstream.h @@ -37,8 +37,8 @@ * in your programs, rather than any of the "st[dl]_*.h" implementation files. */ -#ifndef _FSTREAM -#define _FSTREAM 1 +#ifndef _GLIBCXX_FSTREAM +#define _GLIBCXX_FSTREAM 1 #pragma GCC system_header @@ -827,4 +827,4 @@ namespace std # include #endif -#endif +#endif /* _GLIBCXX_FSTREAM */ diff --git a/libstdc++-v3/include/std/std_functional.h b/libstdc++-v3/include/std/std_functional.h index 0d438589922f..0330eda8e141 100644 --- a/libstdc++-v3/include/std/std_functional.h +++ b/libstdc++-v3/include/std/std_functional.h @@ -46,15 +46,15 @@ * in your programs, rather than any of the "st[dl]_*.h" implementation files. */ -#ifndef _FUNCTIONAL -#define _FUNCTIONAL 1 +#ifndef _GLIBCXX_FUNCTIONAL +#define _GLIBCXX_FUNCTIONAL 1 #pragma GCC system_header #include #include #include -#endif /* _FUNCTIONAL */ +#endif /* _GLIBCXX_FUNCTIONAL */ // Local Variables: // mode:C++ diff --git a/libstdc++-v3/include/std/std_iomanip.h b/libstdc++-v3/include/std/std_iomanip.h index 3adb0dd2bf28..0d965c28bf95 100644 --- a/libstdc++-v3/include/std/std_iomanip.h +++ b/libstdc++-v3/include/std/std_iomanip.h @@ -37,8 +37,8 @@ * in your programs, rather than any of the "st[dl]_*.h" implementation files. */ -#ifndef _IOMANIP -#define _IOMANIP 1 +#ifndef _GLIBCXX_IOMANIP +#define _GLIBCXX_IOMANIP 1 #pragma GCC system_header @@ -297,4 +297,4 @@ namespace std #endif } // namespace std -#endif +#endif /* _GLIBCXX_IOMANIP */ diff --git a/libstdc++-v3/include/std/std_ios.h b/libstdc++-v3/include/std/std_ios.h index 76d10d759ae5..596458f1ede4 100644 --- a/libstdc++-v3/include/std/std_ios.h +++ b/libstdc++-v3/include/std/std_ios.h @@ -36,8 +36,8 @@ * in your programs, rather than any of the "st[dl]_*.h" implementation files. */ -#ifndef _IOS -#define _IOS 1 +#ifndef _GLIBCXX_IOS +#define _GLIBCXX_IOS 1 #pragma GCC system_header @@ -50,5 +50,4 @@ #include #include -#endif /* _IOS */ - +#endif /* _GLIBCXX_IOS */ diff --git a/libstdc++-v3/include/std/std_iosfwd.h b/libstdc++-v3/include/std/std_iosfwd.h index a4877ef1677e..0d275a77e279 100644 --- a/libstdc++-v3/include/std/std_iosfwd.h +++ b/libstdc++-v3/include/std/std_iosfwd.h @@ -37,8 +37,8 @@ * in your programs, rather than any of the "st[dl]_*.h" implementation files. */ -#ifndef _IOSFWD -#define _IOSFWD 1 +#ifndef _GLIBCXX_IOSFWD +#define _GLIBCXX_IOSFWD 1 #pragma GCC system_header @@ -165,4 +165,4 @@ namespace std /** @} */ } // namespace std -#endif +#endif /* _GLIBCXX_IOSFWD */ diff --git a/libstdc++-v3/include/std/std_iostream.h b/libstdc++-v3/include/std/std_iostream.h index 4b025f7287c1..f5049db4a911 100644 --- a/libstdc++-v3/include/std/std_iostream.h +++ b/libstdc++-v3/include/std/std_iostream.h @@ -36,8 +36,8 @@ * in your programs, rather than any of the "st[dl]_*.h" implementation files. */ -#ifndef _IOSTREAM -#define _IOSTREAM 1 +#ifndef _GLIBCXX_IOSTREAM +#define _GLIBCXX_IOSTREAM 1 #pragma GCC system_header @@ -77,4 +77,4 @@ namespace std static ios_base::Init __ioinit; } // namespace std -#endif +#endif /* _GLIBCXX_IOSTREAM */ diff --git a/libstdc++-v3/include/std/std_istream.h b/libstdc++-v3/include/std/std_istream.h index a8621f6c15fa..e27c4f6f7dfa 100644 --- a/libstdc++-v3/include/std/std_istream.h +++ b/libstdc++-v3/include/std/std_istream.h @@ -37,8 +37,8 @@ * in your programs, rather than any of the "st[dl]_*.h" implementation files. */ -#ifndef _ISTREAM -#define _ISTREAM 1 +#ifndef _GLIBCXX_ISTREAM +#define _GLIBCXX_ISTREAM 1 #pragma GCC system_header @@ -775,4 +775,4 @@ namespace std # include #endif -#endif /* _ISTREAM */ +#endif /* _GLIBCXX_ISTREAM */ diff --git a/libstdc++-v3/include/std/std_iterator.h b/libstdc++-v3/include/std/std_iterator.h index 2936cda86acc..3da3e90a414e 100644 --- a/libstdc++-v3/include/std/std_iterator.h +++ b/libstdc++-v3/include/std/std_iterator.h @@ -58,8 +58,8 @@ * in your programs, rather than any of the "st[dl]_*.h" implementation files. */ -#ifndef _ITERATOR -#define _ITERATOR 1 +#ifndef _GLIBCXX_ITERATOR +#define _GLIBCXX_ITERATOR 1 #pragma GCC system_header #include @@ -72,7 +72,7 @@ #include #include -#endif /* _ITERATOR */ +#endif /* _GLIBCXX_ITERATOR */ // Local Variables: // mode:C++ diff --git a/libstdc++-v3/include/std/std_limits.h b/libstdc++-v3/include/std/std_limits.h index efd55e417bec..7f96647f95de 100644 --- a/libstdc++-v3/include/std/std_limits.h +++ b/libstdc++-v3/include/std/std_limits.h @@ -40,8 +40,8 @@ * in your programs, rather than any of the "st[dl]_*.h" implementation files. */ -#ifndef _NUMERIC_LIMITS -#define _NUMERIC_LIMITS 1 +#ifndef _GLIBCXX_NUMERIC_LIMITS +#define _GLIBCXX_NUMERIC_LIMITS 1 #pragma GCC system_header @@ -1140,4 +1140,4 @@ namespace std #undef __glibcxx_digits #undef __glibcxx_digits10 -#endif // _NUMERIC_LIMITS +#endif // _GLIBCXX_NUMERIC_LIMITS diff --git a/libstdc++-v3/include/std/std_list.h b/libstdc++-v3/include/std/std_list.h index 9a8e8a9a162b..5476dd018b81 100644 --- a/libstdc++-v3/include/std/std_list.h +++ b/libstdc++-v3/include/std/std_list.h @@ -58,8 +58,8 @@ * in your programs, rather than any of the "st[dl]_*.h" implementation files. */ -#ifndef _LIST -#define _LIST 1 +#ifndef _GLIBCXX_LIST +#define _GLIBCXX_LIST 1 #pragma GCC system_header @@ -74,5 +74,5 @@ # include #endif -#endif /* _LIST */ +#endif /* _GLIBCXX_LIST */ diff --git a/libstdc++-v3/include/std/std_locale.h b/libstdc++-v3/include/std/std_locale.h index 9c3a101159ed..43417fbdddc7 100644 --- a/libstdc++-v3/include/std/std_locale.h +++ b/libstdc++-v3/include/std/std_locale.h @@ -36,8 +36,8 @@ * in your programs, rather than any of the "st[dl]_*.h" implementation files. */ -#ifndef _LOCALE -#define _LOCALE 1 +#ifndef _GLIBCXX_LOCALE +#define _GLIBCXX_LOCALE 1 #pragma GCC system_header @@ -46,4 +46,4 @@ #include #include -#endif +#endif /* _GLIBCXX_LOCALE */ diff --git a/libstdc++-v3/include/std/std_map.h b/libstdc++-v3/include/std/std_map.h index 7965394dc51f..f4e0ca1aafc2 100644 --- a/libstdc++-v3/include/std/std_map.h +++ b/libstdc++-v3/include/std/std_map.h @@ -58,8 +58,8 @@ * in your programs, rather than any of the "st[dl]_*.h" implementation files. */ -#ifndef _MAP -#define _MAP 1 +#ifndef _GLIBCXX_MAP +#define _GLIBCXX_MAP 1 #pragma GCC system_header @@ -67,7 +67,7 @@ #include #include -#endif /* _MAP */ +#endif /* _GLIBCXX_MAP */ // Local Variables: // mode:C++ diff --git a/libstdc++-v3/include/std/std_memory.h b/libstdc++-v3/include/std/std_memory.h index 68076897ec61..3b7cefaefb05 100644 --- a/libstdc++-v3/include/std/std_memory.h +++ b/libstdc++-v3/include/std/std_memory.h @@ -46,8 +46,8 @@ * in your programs, rather than any of the "st[dl]_*.h" implementation files. */ -#ifndef _MEMORY -#define _MEMORY 1 +#ifndef _GLIBCXX_MEMORY +#define _GLIBCXX_MEMORY 1 #pragma GCC system_header @@ -355,4 +355,4 @@ namespace std }; } // namespace std -#endif +#endif /* _GLIBCXX_MEMORY */ diff --git a/libstdc++-v3/include/std/std_numeric.h b/libstdc++-v3/include/std/std_numeric.h index c287f925a16f..f46150872e98 100644 --- a/libstdc++-v3/include/std/std_numeric.h +++ b/libstdc++-v3/include/std/std_numeric.h @@ -58,8 +58,8 @@ * in your programs, rather than any of the "st[dl]_*.h" implementation files. */ -#ifndef _NUMERIC -#define _NUMERIC 1 +#ifndef _GLIBCXX_NUMERIC +#define _GLIBCXX_NUMERIC 1 #pragma GCC system_header #include @@ -68,7 +68,7 @@ #include #include -#endif /* _NUMERIC */ +#endif /* _GLIBCXX_NUMERIC */ // Local Variables: // mode:C++ diff --git a/libstdc++-v3/include/std/std_ostream.h b/libstdc++-v3/include/std/std_ostream.h index b20354dc520e..0fcf1b1d0d5b 100644 --- a/libstdc++-v3/include/std/std_ostream.h +++ b/libstdc++-v3/include/std/std_ostream.h @@ -37,8 +37,8 @@ * in your programs, rather than any of the "st[dl]_*.h" implementation files. */ -#ifndef _OSTREAM -#define _OSTREAM 1 +#ifndef _GLIBCXX_OSTREAM +#define _GLIBCXX_OSTREAM 1 #pragma GCC system_header @@ -548,4 +548,4 @@ namespace std # include #endif -#endif /* _OSTREAM */ +#endif /* _GLIBCXX_OSTREAM */ diff --git a/libstdc++-v3/include/std/std_queue.h b/libstdc++-v3/include/std/std_queue.h index cd6e5ec6dfe1..a794fe16e9b1 100644 --- a/libstdc++-v3/include/std/std_queue.h +++ b/libstdc++-v3/include/std/std_queue.h @@ -58,8 +58,8 @@ * in your programs, rather than any of the "st[dl]_*.h" implementation files. */ -#ifndef _QUEUE -#define _QUEUE 1 +#ifndef _GLIBCXX_QUEUE +#define _GLIBCXX_QUEUE 1 #pragma GCC system_header #include @@ -79,4 +79,4 @@ # include #endif -#endif /* _QUEUE */ +#endif /* _GLIBCXX_QUEUE */ diff --git a/libstdc++-v3/include/std/std_set.h b/libstdc++-v3/include/std/std_set.h index d59af35b8c50..8dbed180ace1 100644 --- a/libstdc++-v3/include/std/std_set.h +++ b/libstdc++-v3/include/std/std_set.h @@ -58,8 +58,8 @@ * in your programs, rather than any of the "st[dl]_*.h" implementation files. */ -#ifndef _SET -#define _SET 1 +#ifndef _GLIBCXX_SET +#define _GLIBCXX_SET 1 #pragma GCC system_header @@ -67,7 +67,7 @@ #include #include -#endif /* _SET */ +#endif /* _GLIBCXX_SET */ // Local Variables: // mode:C++ diff --git a/libstdc++-v3/include/std/std_sstream.h b/libstdc++-v3/include/std/std_sstream.h index dcdb7a713bf3..5db194249e1f 100644 --- a/libstdc++-v3/include/std/std_sstream.h +++ b/libstdc++-v3/include/std/std_sstream.h @@ -36,8 +36,8 @@ * in your programs, rather than any of the "st[dl]_*.h" implementation files. */ -#ifndef _SSTREAM -#define _SSTREAM 1 +#ifndef _GLIBCXX_SSTREAM +#define _GLIBCXX_SSTREAM 1 #pragma GCC system_header @@ -648,4 +648,4 @@ namespace std # include #endif -#endif +#endif /* _GLIBCXX_SSTREAM */ diff --git a/libstdc++-v3/include/std/std_stack.h b/libstdc++-v3/include/std/std_stack.h index 1da582ee9570..5ba8b2ed33ef 100644 --- a/libstdc++-v3/include/std/std_stack.h +++ b/libstdc++-v3/include/std/std_stack.h @@ -58,8 +58,8 @@ * in your programs, rather than any of the "st[dl]_*.h" implementation files. */ -#ifndef _STACK -#define _STACK 1 +#ifndef _GLIBCXX_STACK +#define _GLIBCXX_STACK 1 #pragma GCC system_header @@ -74,4 +74,4 @@ # include #endif -#endif /* _STACK */ +#endif /* _GLIBCXX_STACK */ diff --git a/libstdc++-v3/include/std/std_stdexcept.h b/libstdc++-v3/include/std/std_stdexcept.h index 38ff1ad219d2..ebd97f50f887 100644 --- a/libstdc++-v3/include/std/std_stdexcept.h +++ b/libstdc++-v3/include/std/std_stdexcept.h @@ -36,8 +36,8 @@ * in your programs, rather than any of the "st[dl]_*.h" implementation files. */ -#ifndef _STDEXCEPT -#define _STDEXCEPT 1 +#ifndef _GLIBCXX_STDEXCEPT +#define _GLIBCXX_STDEXCEPT 1 #pragma GCC system_header @@ -145,4 +145,4 @@ namespace std }; } // namespace std -#endif // _STDEXCEPT +#endif /* _GLIBCXX_STDEXCEPT */ diff --git a/libstdc++-v3/include/std/std_streambuf.h b/libstdc++-v3/include/std/std_streambuf.h index 1946d50cd12b..ad639d3b1cd0 100644 --- a/libstdc++-v3/include/std/std_streambuf.h +++ b/libstdc++-v3/include/std/std_streambuf.h @@ -37,8 +37,8 @@ * in your programs, rather than any of the "st[dl]_*.h" implementation files. */ -#ifndef _STREAMBUF -#define _STREAMBUF 1 +#ifndef _CLIBXX_STREAMBUF +#define _CLIBXX_STREAMBUF 1 #pragma GCC system_header @@ -784,4 +784,4 @@ namespace std #include #endif -#endif +#endif /* _GLIBCXX_STREAMBUF */ diff --git a/libstdc++-v3/include/std/std_string.h b/libstdc++-v3/include/std/std_string.h index f365a32dc936..6c60a8493b5b 100644 --- a/libstdc++-v3/include/std/std_string.h +++ b/libstdc++-v3/include/std/std_string.h @@ -37,8 +37,8 @@ * in your programs, rather than any of the "st[dl]_*.h" implementation files. */ -#ifndef _STRING -#define _STRING 1 +#ifndef _GLIBCXX_STRING +#define _GLIBCXX_STRING 1 #pragma GCC system_header @@ -57,5 +57,4 @@ # include #endif -#endif /* _STRING */ - +#endif /* _GLIBCXX_STRING */ diff --git a/libstdc++-v3/include/std/std_utility.h b/libstdc++-v3/include/std/std_utility.h index a0d7bbe8d57f..f5793425b221 100644 --- a/libstdc++-v3/include/std/std_utility.h +++ b/libstdc++-v3/include/std/std_utility.h @@ -58,15 +58,15 @@ * in your programs, rather than any of the "st[dl]_*.h" implementation files. */ -#ifndef _UTILITY -#define _UTILITY 1 +#ifndef _GLIBCXX_UTILITY +#define _GLIBCXX_UTILITY 1 #pragma GCC system_header #include #include #include -#endif /* _UTILITY */ +#endif /* _GLIBCXX_UTILITY */ // Local Variables: // mode:C++ diff --git a/libstdc++-v3/include/std/std_valarray.h b/libstdc++-v3/include/std/std_valarray.h index 4656dc3b7530..09367488c8bb 100644 --- a/libstdc++-v3/include/std/std_valarray.h +++ b/libstdc++-v3/include/std/std_valarray.h @@ -35,8 +35,8 @@ * in your programs, rather than any of the "st[dl]_*.h" implementation files. */ -#ifndef _VALARRAY -#define _VALARRAY 1 +#ifndef _GLIBCXX_VALARRAY +#define _GLIBCXX_VALARRAY 1 #pragma GCC system_header @@ -689,7 +689,7 @@ _DEFINE_BINARY_OPERATOR(>=, __greater_equal) } // namespace std -#endif // _VALARRAY +#endif /* _GLIBCXX_VALARRAY */ // Local Variables: // mode:c++ diff --git a/libstdc++-v3/include/std/std_vector.h b/libstdc++-v3/include/std/std_vector.h index 336f7bf2ddb9..8802b455286f 100644 --- a/libstdc++-v3/include/std/std_vector.h +++ b/libstdc++-v3/include/std/std_vector.h @@ -58,8 +58,8 @@ * in your programs, rather than any of the "st[dl]_*.h" implementation files. */ -#ifndef _VECTOR -#define _VECTOR 1 +#ifndef _GLIBCXX_VECTOR +#define _GLIBCXX_VECTOR 1 #pragma GCC system_header @@ -75,5 +75,5 @@ # include #endif -#endif /* _VECTOR */ +#endif /* _GLIBCXX_VECTOR */