commit 3db88036f60ee6085ea1decfd34a07ed9b5e68a1
author Howard Hinnant <hhinnant@apple.com> Sat Aug 21 20:58:44 2010 +0000
committer Howard Hinnant <hhinnant@apple.com> Sat Aug 21 20:58:44 2010 +0000
tree 056b63b384ad8212624b5c41848b32232fc6124b
parent ac305d2024318de1ee291fd360c210583b6ea79e

US 117

llvm-svn: 111745

libcxx/include/forward_list

diff --git a/libcxx/include/forward_list b/libcxx/include/forward_list
index 038d85d..dbdc843 100644
--- a/libcxx/include/forward_list
+++ b/libcxx/include/forward_list
@@ -97,8 +97,8 @@
                               InputIterator first, InputIterator last);
     iterator insert_after(const_iterator p, initializer_list<value_type> il);
 
-    void erase_after(const_iterator p);
-    void erase_after(const_iterator first, const_iterator last);
+    iterator erase_after(const_iterator p);
+    iterator erase_after(const_iterator first, const_iterator last);
 
     void swap(forward_list& x);
 
@@ -568,8 +568,8 @@
     iterator insert_after(const_iterator __p, initializer_list<value_type> __il)
         {return insert_after(__p, __il.begin(), __il.end());}
 
-    void erase_after(const_iterator __p);
-    void erase_after(const_iterator __f, const_iterator __l);
+    iterator erase_after(const_iterator __p);
+    iterator erase_after(const_iterator __f, const_iterator __l);
 
     void swap(forward_list& __x) {base::swap(__x);}
 
@@ -1033,7 +1033,7 @@
 }
 
 template <class _Tp, class _Alloc>
-void
+typename forward_list<_Tp, _Alloc>::iterator
 forward_list<_Tp, _Alloc>::erase_after(const_iterator __f)
 {
     __node_pointer __p = const_cast<__node_pointer>(__f.__ptr_);
@@ -1042,17 +1042,18 @@
     __node_allocator& __a = base::__alloc();
     __node_traits::destroy(__a, addressof(__n->__value_));
     __node_traits::deallocate(__a, __n, 1);
+    return iterator(__p->__next_);
 }
 
 template <class _Tp, class _Alloc>
-void
+typename forward_list<_Tp, _Alloc>::iterator
 forward_list<_Tp, _Alloc>::erase_after(const_iterator __f, const_iterator __l)
 {
+    __node_pointer __e = const_cast<__node_pointer>(__l.__ptr_);
     if (__f != __l)
     {
         __node_pointer __p = const_cast<__node_pointer>(__f.__ptr_);
         __node_pointer __n = __p->__next_;
-        __node_pointer __e = const_cast<__node_pointer>(__l.__ptr_);
         if (__n != __e)
         {
             __p->__next_ = __e;
@@ -1066,6 +1067,7 @@
             } while (__n != __e);
         }
     }
+    return iterator(__e);
 }
 
 template <class _Tp, class _Alloc>