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 71a370fee1acf5481697f41bb9752f5e01ec9c62..923ea700b7bf00e237c76723e949a26ccbdcc245 100644 (file)
--- 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 84820583b3b6bda48830ce54d55fe5bae83b42c2..73fd6c861a0cc2c2cb8ad04493421e149565324a 100644 (file)
--- 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 4bda2db02b0ff501feb7cf6618ac1b234fe90f34..b751b823347dd6524eea0fab6a34fcbab46caa95 100644 (file)
--- 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>