aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <pcarlini@unitus.it>2001-12-31 20:30:24 +0100
committerPaolo Carlini <paolo@gcc.gnu.org>2001-12-31 19:30:24 +0000
commit6d66e50d528d1a003fe040606050066e76fcb99a (patch)
tree2d99820547e033d5ea0e4cb83ab212cfedb91535
parent36955a954f1177f75656351221074c2fac58a757 (diff)
downloadgcc-6d66e50d528d1a003fe040606050066e76fcb99a.zip
gcc-6d66e50d528d1a003fe040606050066e76fcb99a.tar.gz
gcc-6d66e50d528d1a003fe040606050066e76fcb99a.tar.bz2
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
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/ext/iterator7
-rw-r--r--libstdc++-v3/testsuite/ext/headers.cc1
3 files changed, 10 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 71a370f..923ea70 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
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.
* include/backward/iterator.h: Include <ext/iterator>,
add using declaration.
diff --git a/libstdc++-v3/include/ext/iterator b/libstdc++-v3/include/ext/iterator
index 8482058..73fd6c8 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 4bda2db..b751b82 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>