From 1de853b169e6efe274f30270ef4ca7c9e827f773 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Fri, 8 Aug 2008 09:54:09 +0000 Subject: [PATCH] ios_base.h: Undef _IOS_BASE_SEEK_CUR and _IOS_BASE_SEEK_END at the end of the file. 2008-08-08 Paolo Carlini * include/bits/ios_base.h: Undef _IOS_BASE_SEEK_CUR and _IOS_BASE_SEEK_END at the end of the file. * include/bits/char_traits.h: Likewise for _CHAR_TRAITS_EOF. From-SVN: r138862 --- libstdc++-v3/ChangeLog | 9 ++++++++- libstdc++-v3/include/bits/char_traits.h | 2 ++ libstdc++-v3/include/bits/ios_base.h | 3 +++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 8acde4bf563..1c50b971989 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,6 +1,13 @@ +2008-08-08 Paolo Carlini + + * include/bits/ios_base.h: Undef _IOS_BASE_SEEK_CUR and + _IOS_BASE_SEEK_END at the end of the file. + * include/bits/char_traits.h: Likewise for _CHAR_TRAITS_EOF. + 2008-08-07 Stephen M. Webb - * include/tr1_impl/regex (match_results): Add cbegin()/cend() per N2691 WD. + * include/tr1_impl/regex (match_results<>::cbegin, cend): Add, per + N2691 WD. 2008-08-06 Paolo Carlini diff --git a/libstdc++-v3/include/bits/char_traits.h b/libstdc++-v3/include/bits/char_traits.h index 85e4167758e..52158efff33 100644 --- a/libstdc++-v3/include/bits/char_traits.h +++ b/libstdc++-v3/include/bits/char_traits.h @@ -374,4 +374,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _GLIBCXX_END_NAMESPACE +#undef _CHAR_TRAITS_EOF + #endif diff --git a/libstdc++-v3/include/bits/ios_base.h b/libstdc++-v3/include/bits/ios_base.h index 8b55028c537..6e2cef6a342 100644 --- a/libstdc++-v3/include/bits/ios_base.h +++ b/libstdc++-v3/include/bits/ios_base.h @@ -976,5 +976,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _GLIBCXX_END_NAMESPACE +#undef _IOS_BASE_SEEK_CUR +#undef _IOS_BASE_SEEK_END + #endif /* _IOS_BASE_H */