2010-02-11 Paolo Carlini <paolo.carlini@oracle.com>

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / include / debug / unordered_set

diff --git a/libstdc++-v3/include/debug/unordered_set b/libstdc++-v3/include/debug/unordered_set
index f851718..8efe3fb 100644 (file)
--- a/libstdc++-v3/include/debug/unordered_set
+++ b/libstdc++-v3/include/debug/unordered_set
@@ -243,25 +243,24 @@ namespace __debug
        return __ret;
       }
 
-      iterator
+      void
       erase(const_iterator __it)
       {
        __glibcxx_check_erase(__it);
        __it._M_invalidate();
-       return iterator(_Base::erase(__it.base()), this);
+       _Base::erase(__it.base());
       }
 
-      iterator
+      void
       erase(const_iterator __first, const_iterator __last)
       {
        __glibcxx_check_erase_range(__first, __last);
        for (const_iterator __tmp = __first; __tmp != __last;)
-       {
-         const_iterator __victim = __tmp++;
-         __victim._M_invalidate();
-       }
-       return iterator(_Base::erase(__first.base(),
-                                    __last.base()), this);
+         {
+           const_iterator __victim = __tmp++;
+           __victim._M_invalidate();
+         }
+       _Base::erase(__first.base(), __last.base());
       }
 
       _Base&
@@ -478,25 +477,24 @@ namespace __debug
        return __ret;
       }
 
-      iterator
+      void
       erase(const_iterator __it)
       {
        __glibcxx_check_erase(__it);
        __it._M_invalidate();
-       return iterator(_Base::erase(__it.base()), this);
+       _Base::erase(__it.base());
       }
 
-      iterator
+      void
       erase(const_iterator __first, const_iterator __last)
       {
        __glibcxx_check_erase_range(__first, __last);
        for (const_iterator __tmp = __first; __tmp != __last;)
-       {
-         const_iterator __victim = __tmp++;
-         __victim._M_invalidate();
-       }
-       return iterator(_Base::erase(__first.base(),
-                                    __last.base()), this);
+         {
+           const_iterator __victim = __tmp++;
+           __victim._M_invalidate();
+         }
+       _Base::erase(__first.base(), __last.base());
       }
 
       _Base&