From 5f708c5444da99c24c834855594e401854f64d7f Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Wed, 17 Oct 2007 09:45:04 +0000 Subject: [PATCH] array: Correct macro guarding cbegin, cend, crbegin, crend. 2007-10-17 Paolo Carlini * include/tr1_impl/array: Correct macro guarding cbegin, cend, crbegin, crend. * include/tr1_impl/hashtable: Likewise. From-SVN: r129404 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/include/tr1_impl/array | 2 +- libstdc++-v3/include/tr1_impl/hashtable | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 6f04a7f23a1..754918672b5 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2007-10-17 Paolo Carlini + + * include/tr1_impl/array: Correct macro guarding cbegin, cend, + crbegin, crend. + * include/tr1_impl/hashtable: Likewise. + 2007-10-16 Paolo Carlini * include/ext/vstring.h (__versa_string<>::front, diff --git a/libstdc++-v3/include/tr1_impl/array b/libstdc++-v3/include/tr1_impl/array index 759f00e4b5a..83cad1511f3 100644 --- a/libstdc++-v3/include/tr1_impl/array +++ b/libstdc++-v3/include/tr1_impl/array @@ -97,7 +97,7 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 rend() const { return const_reverse_iterator(begin()); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#ifdef _GLIBCXX_INCLUDE_AS_CXX0X const_iterator cbegin() const { return const_iterator(&_M_instance[0]); } diff --git a/libstdc++-v3/include/tr1_impl/hashtable b/libstdc++-v3/include/tr1_impl/hashtable index 1f7deed068a..093af39fef3 100644 --- a/libstdc++-v3/include/tr1_impl/hashtable +++ b/libstdc++-v3/include/tr1_impl/hashtable @@ -252,7 +252,7 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 end() const { return const_iterator(_M_buckets + _M_bucket_count); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#ifdef _GLIBCXX_INCLUDE_AS_CXX0X const_iterator cbegin() const { -- 2.30.2