aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <paolo@gcc.gnu.org>2008-08-08 09:54:09 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2008-08-08 09:54:09 +0000
commit1de853b169e6efe274f30270ef4ca7c9e827f773 (patch)
tree37e8059f78df2643739caf4b6d4cce96db7b78fb
parent03c3034efee5a34b6f19a4f26b49d8341f2df6ea (diff)
downloadgcc-1de853b169e6efe274f30270ef4ca7c9e827f773.zip
gcc-1de853b169e6efe274f30270ef4ca7c9e827f773.tar.gz
gcc-1de853b169e6efe274f30270ef4ca7c9e827f773.tar.bz2
ios_base.h: Undef _IOS_BASE_SEEK_CUR and _IOS_BASE_SEEK_END at the end of the file.
2008-08-08 Paolo Carlini <paolo.carlini@oracle.com> * 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
-rw-r--r--libstdc++-v3/ChangeLog9
-rw-r--r--libstdc++-v3/include/bits/char_traits.h2
-rw-r--r--libstdc++-v3/include/bits/ios_base.h3
3 files changed, 13 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8acde4b..1c50b97 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,6 +1,13 @@
+2008-08-08 Paolo Carlini <paolo.carlini@oracle.com>
+
+ * 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 <stephenw@xandros.com>
- * 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 <paolo.carlini@oracle.com>
diff --git a/libstdc++-v3/include/bits/char_traits.h b/libstdc++-v3/include/bits/char_traits.h
index 85e4167..52158ef 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 8b55028..6e2cef6 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 */