diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2010-08-21 20:58:44 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2010-08-21 20:58:44 +0000 |
| commit | 7a2523b201eb46508db7570718da915f8f982a4a (patch) | |
| tree | ff8e2282a4a15f7cc01b4877597c7b3436ff5286 /include/forward_list | |
| parent | 98e5d974006989c505d7b2ec7b9e4b20b0f01e26 (diff) | |
US 117
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@111745 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/forward_list')
| -rw-r--r-- | include/forward_list | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/include/forward_list b/include/forward_list index 038d85d7b..dbdc8430d 100644 --- a/include/forward_list +++ b/include/forward_list @@ -97,8 +97,8 @@ public: 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 @@ public: 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 @@ forward_list<_Tp, _Alloc>::insert_after(const_iterator __p, } 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 @@ forward_list<_Tp, _Alloc>::erase_after(const_iterator __f) __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 @@ forward_list<_Tp, _Alloc>::erase_after(const_iterator __f, const_iterator __l) } while (__n != __e); } } + return iterator(__e); } template <class _Tp, class _Alloc> |