commit ba590bdc97371cafb8767bbeb9e08373c25e71e4
author Howard Hinnant <hhinnant@apple.com> Thu Aug 19 17:40:04 2010 +0000
committer Howard Hinnant <hhinnant@apple.com> Thu Aug 19 17:40:04 2010 +0000
tree 3c63992ad59a270bef87343fefd954e604ff1684
parent 4a23e1e0606833eb7aa35237b1247d61a20b1257

LWG 1278

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@111532 91177308-0d34-0410-b5e6-96231b3b80d8

include/forward_list

diff --git a/include/forward_list b/include/forward_list
index 44d381a..038d85d 100644
--- a/include/forward_list
+++ b/include/forward_list
@@ -942,7 +942,7 @@
 forward_list<_Tp, _Alloc>::insert_after(const_iterator __p, size_type __n,
                                         const value_type& __v)
 {
-    __node_pointer const __r = const_cast<__node_pointer>(__p.__ptr_);
+    __node_pointer __r = const_cast<__node_pointer>(__p.__ptr_);
     if (__n > 0)
     {
         __node_allocator& __a = base::__alloc();
@@ -977,6 +977,7 @@
 #endif
         __last->__next_ = __r->__next_;
         __r->__next_ = __first;
+        __r = __last;
     }
     return iterator(__r);
 }
@@ -991,7 +992,7 @@
 forward_list<_Tp, _Alloc>::insert_after(const_iterator __p,
                                         _InputIterator __f, _InputIterator __l)
 {
-    __node_pointer const __r = const_cast<__node_pointer>(__p.__ptr_);
+    __node_pointer __r = const_cast<__node_pointer>(__p.__ptr_);
     if (__f != __l)
     {
         __node_allocator& __a = base::__alloc();
@@ -1026,6 +1027,7 @@
 #endif
         __last->__next_ = __r->__next_;
         __r->__next_ = __first;
+        __r = __last;
     }
     return iterator(__r);
 }