From: Paolo Carlini <pcarlini@unitus.it>
Date: Mon, 31 Dec 2001 19:30:24 +0000 (+0100)
Subject: iterator: Add #include <bits/std_iterator.h>, tweak.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6d66e50d528d1a003fe040606050066e76fcb99a;p=gcc.git

iterator: Add #include <bits/std_iterator.h>, tweak.

2001-12-31  Paolo Carlini  <pcarlini@unitus.it>

	* include/ext/iterator:  Add #include <bits/std_iterator.h>, tweak.
	* testsuite/ext/headers.cc:  Add <ext/iterator>.

From-SVN: r48430
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 71a370fee1a..923ea700b7b 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-31  Paolo Carlini  <pcarlini@unitus.it>
+
+	* include/ext/iterator:  Add #include <bits/std_iterator.h>, tweak.
+	* testsuite/ext/headers.cc:  Add <ext/iterator>.
+
 2001-12-31  Paolo Carlini  <pcarlini@unitus.it>
 
 	* include/backward/algo.h:  Add two more using declarations.
diff --git a/libstdc++-v3/include/ext/iterator b/libstdc++-v3/include/ext/iterator
index 84820583b3b..73fd6c861a0 100644
--- a/libstdc++-v3/include/ext/iterator
+++ b/libstdc++-v3/include/ext/iterator
@@ -63,6 +63,7 @@
 
 #pragma GCC system_header
 #include <bits/concept_check.h>
+#include <bits/std_iterator.h>
 
 namespace __gnu_cxx
 {
@@ -74,7 +75,7 @@ namespace __gnu_cxx
   template<typename _InputIterator, typename _Distance>
     inline void
     __distance(_InputIterator __first, _InputIterator __last,
-	       _Distance& __n, input_iterator_tag)
+	       _Distance& __n, std::input_iterator_tag)
     {
       // concept requirements
       __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
@@ -84,7 +85,7 @@ namespace __gnu_cxx
   template<typename _RandomAccessIterator, typename _Distance>
     inline void
     __distance(_RandomAccessIterator __first, _RandomAccessIterator __last, 
-	       _Distance& __n, random_access_iterator_tag)
+	       _Distance& __n, std::random_access_iterator_tag)
     {
       // concept requirements
       __glibcpp_function_requires(_RandomAccessIteratorConcept<_RandomAccessIterator>)
@@ -97,7 +98,7 @@ namespace __gnu_cxx
              _Distance& __n)
     {
       // concept requirements -- taken care of in __distance
-      __distance(__first, __last, __n, __iterator_category(__first));
+      __distance(__first, __last, __n, std::__iterator_category(__first));
     }
 
 } // namespace __gnu_cxx
diff --git a/libstdc++-v3/testsuite/ext/headers.cc b/libstdc++-v3/testsuite/ext/headers.cc
index 4bda2db02b0..b751b823347 100644
--- a/libstdc++-v3/testsuite/ext/headers.cc
+++ b/libstdc++-v3/testsuite/ext/headers.cc
@@ -26,6 +26,7 @@
 #include <ext/algorithm>
 #include <ext/hash_map>
 #include <ext/hash_set>
+#include <ext/iterator>
 #include <ext/rope>
 #include <ext/slist>