From d34cc9acac3d29d6c3fa0ac6e876fdeb23dfcfd2 Mon Sep 17 00:00:00 2001
From: gdr <gdr@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 24 Jan 2000 11:25:23 +0000
Subject: [PATCH] 2000-01-19  Gabriel Dos Reis  <dosreis@cmla.ens-cachan.fr>

        * stl_iterator.h: Make it possible to use standard class
        `iterator'.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@31584 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libstdc++/stl/ChangeLog      | 5 +++++
 libstdc++/stl/stl_iterator.h | 2 --
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/libstdc++/stl/ChangeLog b/libstdc++/stl/ChangeLog
index c574129..1c617af 100644
--- a/libstdc++/stl/ChangeLog
+++ b/libstdc++/stl/ChangeLog
@@ -1,3 +1,8 @@
+2000-01-19  Gabriel Dos Reis  <dosreis@cmla.ens-cachan.fr>
+
+	* stl_iterator.h: Make it possible to use standard class
+	`iterator'. 
+
 1999-12-14  Mumit Khan  <khan@xraylith.wisc.edu>
 
 	* stl_config.h (__MINGW32__): Define __STL_WIN32THREADS for thread
diff --git a/libstdc++/stl/stl_iterator.h b/libstdc++/stl/stl_iterator.h
index e2bd714..517bc5f 100644
--- a/libstdc++/stl/stl_iterator.h
+++ b/libstdc++/stl/stl_iterator.h
@@ -85,7 +85,6 @@ template <class _Tp, class _Distance> struct random_access_iterator {
   typedef _Tp&                       reference;
 };
 
-#ifdef __STL_USE_NAMESPACES
 template <class _Category, class _Tp, class _Distance = ptrdiff_t,
           class _Pointer = _Tp*, class _Reference = _Tp&>
 struct iterator {
@@ -95,7 +94,6 @@ struct iterator {
   typedef _Pointer   pointer;
   typedef _Reference reference;
 };
-#endif /* __STL_USE_NAMESPACES */
 
 #ifdef __STL_CLASS_PARTIAL_SPECIALIZATION
 
-- 
2.7.4