[multiple changes]

2002-04-16  Paolo Carlini <pcarlini@unitus.it>
        * testsuite/24_iterators/rel_ops.cc: New test.

2002-04-16  Gabriel Dos Reis  <gdr@merlin.codesourcery.com>

        * include/bits/type_traits.h (__normal_iterator): Declare in
        __gnu_cxx.  Adjust use at global namespace.
        * include/bits/stl_iterator.h (__normal_iterator): Move
        definition
        into __gnu_cxx::. Add more operator overloads.  Tidy existing
        ones.
        * include/bits/basic_string.h (basic_string): Adjust use of
        __normal_iterator.
        * include/bits/stl_vector.h (_Alloc>): Likewise.
        * src/concept-inst.cc (__gnu_cxx): __normal_iterator<> is now
        here.
        * src/string-inst.cc (operator==): Instantiate in __gnu_cxx.

From-SVN: r52348

2 files changed, 22 insertions, 14 deletions

diff --git a/libstdc++-v3/src/concept-inst.cc b/libstdc++-v3/src/concept-inst.cc
index 11e4a89a831..a467a810c81 100644
--- a/libstdc++-v3/src/concept-inst.cc
+++ b/libstdc++-v3/src/concept-inst.cc
@@ -50,11 +50,11 @@ namespace __gnu_cxx
   template void __aux_require_boolean_expr<bool>(bool const&);
 
   _Instantiate(_BidirectionalIteratorConcept<
-    std::__normal_iterator< std::locale::facet**,
+    __normal_iterator< std::locale::facet**,
     std::vector<std::locale::facet*,std::allocator<std::locale::facet*> > > > );
 
   _Instantiate(_BidirectionalIteratorConcept<
-    std::__normal_iterator< unsigned*,
+    __normal_iterator< unsigned*,
     std::vector<unsigned, std::allocator<unsigned> > > > );
 
   _Instantiate(_ConvertibleConcept<std::locale::facet*, std::locale::facet*> );
@@ -68,15 +68,15 @@ namespace __gnu_cxx
   _Instantiate(_InputIteratorConcept<std::locale::facet**> );
 
   _Instantiate(_InputIteratorConcept<
-    std::__normal_iterator< std::locale::facet* const*,
+    __normal_iterator< std::locale::facet* const*,
     std::vector<std::locale::facet*,std::allocator<std::locale::facet*> > > > );
 
   _Instantiate(_InputIteratorConcept<
-    std::__normal_iterator< std::locale::facet**,
+    __normal_iterator< std::locale::facet**,
     std::vector<std::locale::facet*,std::allocator<std::locale::facet*> > > > );
 
   _Instantiate(_InputIteratorConcept<
-    std::__normal_iterator< unsigned*,
+    __normal_iterator< unsigned*,
     std::vector<unsigned, std::allocator<unsigned> > > > );
 
 #ifdef _GLIBCPP_USE_WCHAR_T
@@ -98,26 +98,26 @@ namespace __gnu_cxx
   _Instantiate(_LessThanComparableConcept<unsigned> );
 
   _Instantiate(_Mutable_BidirectionalIteratorConcept<
-    std::__normal_iterator< std::locale::facet**,
+    __normal_iterator< std::locale::facet**,
     std::vector<std::locale::facet*,std::allocator<std::locale::facet*> > > > );
 
   _Instantiate(_Mutable_BidirectionalIteratorConcept<
-    std::__normal_iterator< unsigned*,
+    __normal_iterator< unsigned*,
     std::vector<unsigned, std::allocator<unsigned> > > > );
 
   _Instantiate(_Mutable_ForwardIteratorConcept<
-    std::__normal_iterator< std::locale::facet**,
+    __normal_iterator< std::locale::facet**,
     std::vector<std::locale::facet*,std::allocator<std::locale::facet*> > > > );
 
   _Instantiate(_OutputIteratorConcept<
     std::locale::facet**, std::locale::facet*> );
 
   _Instantiate(_OutputIteratorConcept<
-    std::__normal_iterator< std::locale::facet**,
+    __normal_iterator< std::locale::facet**,
       std::vector<std::locale::facet*, std::allocator<std::locale::facet* > > >,
     std::locale::facet* > );
 
-  _Instantiate(_OutputIteratorConcept<std::__normal_iterator<
+  _Instantiate(_OutputIteratorConcept<__normal_iterator<
     unsigned*, std::vector<unsigned, std::allocator<unsigned> > >, unsigned> );
 
   _Instantiate(_OutputIteratorConcept<std::ostreambuf_iterator<
@@ -133,19 +133,19 @@ namespace __gnu_cxx
   _Instantiate(_RandomAccessIteratorConcept<char const*> );
 
   _Instantiate(_RandomAccessIteratorConcept<
-    std::__normal_iterator<char const*, std::string> > );
+    __normal_iterator<char const*, std::string> > );
 
   _Instantiate(_RandomAccessIteratorConcept<
-    std::__normal_iterator<char*, std::string> > );
+    __normal_iterator<char*, std::string> > );
 
 #ifdef _GLIBCPP_USE_WCHAR_T
   _Instantiate(_RandomAccessIteratorConcept<
-    std::__normal_iterator<wchar_t const*,
+    __normal_iterator<wchar_t const*,
     std::basic_string<wchar_t, std::char_traits<wchar_t>,
                                std::allocator<wchar_t> > > > );
 
   _Instantiate(_RandomAccessIteratorConcept<
-    std::__normal_iterator<wchar_t*,
+    __normal_iterator<wchar_t*,
     std::basic_string<wchar_t, std::char_traits<wchar_t>,
                                std::allocator<wchar_t> > > > );
 
diff --git a/libstdc++-v3/src/string-inst.cc b/libstdc++-v3/src/string-inst.cc
index 7ebc0c5abd3..e812aa0cfc2 100644
--- a/libstdc++-v3/src/string-inst.cc
+++ b/libstdc++-v3/src/string-inst.cc
@@ -48,9 +48,17 @@ namespace std
   template class basic_string<C>;
   template S operator+(const C*, const S&);
   template S operator+(C, const S&);
+} // namespace std
+
+namespace __gnu_cxx
+{
+  using std::S;
   template bool operator==(const S::iterator&, const S::iterator&);
   template bool operator==(const S::const_iterator&, const S::const_iterator&);
+}
 
+namespace std
+{
   // Only one template keyword allowed here. 
   // See core issue #46 (NAD)
   // http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/cwg_closed.html#46