2007-10-17 Paolo Carlini <pcarlini@suse.de>

	* include/tr1_impl/array: Correct macro guarding cbegin, cend,
	crbegin, crend.
	* include/tr1_impl/hashtable: Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@129404 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6f04a7f..7549186 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-17  Paolo Carlini  <pcarlini@suse.de>
+
+       * include/tr1_impl/array: Correct macro guarding cbegin, cend,
+       crbegin, crend.
+       * include/tr1_impl/hashtable: Likewise.
+
 2007-10-16  Paolo Carlini  <pcarlini@suse.de>
 
        * include/ext/vstring.h (__versa_string<>::front, 

diff --git a/libstdc++-v3/include/tr1_impl/array b/libstdc++-v3/include/tr1_impl/array
index 759f00e..83cad15 100644 (file)
--- 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 1f7deed..093af39 100644 (file)
--- 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
       {