generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

LWG 1278

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@111532 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Howard Hinnant 2010-08-19 17:40:04 +00:00
parent 4a23e1e060
commit ba590bdc97
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/forward_list
View File

@ -942,7 +942,7 @@ typename forward_list<_Tp, _Alloc>::iterator
forward_list<_Tp, _Alloc>::insert_after(const_iterator __p, size_type __n, forward_list<_Tp, _Alloc>::insert_after(const_iterator __p, size_type __n,
const value_type& __v) 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) if (__n > 0)
{ {
__node_allocator& __a = base::__alloc(); __node_allocator& __a = base::__alloc();
@ -977,6 +977,7 @@ forward_list<_Tp, _Alloc>::insert_after(const_iterator __p, size_type __n,
#endif #endif
__last->__next_ = __r->__next_; __last->__next_ = __r->__next_;
__r->__next_ = __first; __r->__next_ = __first;
__r = __last;
} }
return iterator(__r); return iterator(__r);
} }
@ -991,7 +992,7 @@ typename enable_if
forward_list<_Tp, _Alloc>::insert_after(const_iterator __p, forward_list<_Tp, _Alloc>::insert_after(const_iterator __p,
_InputIterator __f, _InputIterator __l) _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) if (__f != __l)
{ {
__node_allocator& __a = base::__alloc(); __node_allocator& __a = base::__alloc();
@ -1026,6 +1027,7 @@ forward_list<_Tp, _Alloc>::insert_after(const_iterator __p,
#endif #endif
__last->__next_ = __r->__next_; __last->__next_ = __r->__next_;
__r->__next_ = __first; __r->__next_ = __first;
__r = __last;
} }
return iterator(__r); return iterator(__r);
} }

4
test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_init.pass.cpp
View File

@ -27,14 +27,14 @@ int main()
assert(distance(c.begin(), c.end()) == 0); assert(distance(c.begin(), c.end()) == 0);
i = c.insert_after(c.cbefore_begin(), {0, 1, 2}); i = c.insert_after(c.cbefore_begin(), {0, 1, 2});
assert(i == c.before_begin()); assert(i == next(c.before_begin(), 3));
assert(distance(c.begin(), c.end()) == 3); assert(distance(c.begin(), c.end()) == 3);
assert(*next(c.begin(), 0) == 0); assert(*next(c.begin(), 0) == 0);
assert(*next(c.begin(), 1) == 1); assert(*next(c.begin(), 1) == 1);
assert(*next(c.begin(), 2) == 2); assert(*next(c.begin(), 2) == 2);
i = c.insert_after(c.begin(), {3, 4}); i = c.insert_after(c.begin(), {3, 4});
assert(i == c.begin()); assert(i == next(c.begin(), 2));
assert(distance(c.begin(), c.end()) == 5); assert(distance(c.begin(), c.end()) == 5);
assert(*next(c.begin(), 0) == 0); assert(*next(c.begin(), 0) == 0);
assert(*next(c.begin(), 1) == 3); assert(*next(c.begin(), 1) == 3);

4
test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp
View File

@ -32,14 +32,14 @@ int main()
assert(distance(c.begin(), c.end()) == 0); assert(distance(c.begin(), c.end()) == 0);
i = c.insert_after(c.cbefore_begin(), J(t), J(t+3)); i = c.insert_after(c.cbefore_begin(), J(t), J(t+3));
assert(i == c.before_begin()); assert(i == next(c.before_begin(), 3));
assert(distance(c.begin(), c.end()) == 3); assert(distance(c.begin(), c.end()) == 3);
assert(*next(c.begin(), 0) == 0); assert(*next(c.begin(), 0) == 0);
assert(*next(c.begin(), 1) == 1); assert(*next(c.begin(), 1) == 1);
assert(*next(c.begin(), 2) == 2); assert(*next(c.begin(), 2) == 2);
i = c.insert_after(c.begin(), J(t+3), J(t+5)); i = c.insert_after(c.begin(), J(t+3), J(t+5));
assert(i == c.begin()); assert(i == next(c.begin(), 2));
assert(distance(c.begin(), c.end()) == 5); assert(distance(c.begin(), c.end()) == 5);
assert(*next(c.begin(), 0) == 0); assert(*next(c.begin(), 0) == 0);
assert(*next(c.begin(), 1) == 3); assert(*next(c.begin(), 1) == 3);

4
test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_size_value.pass.cpp
View File

@ -27,14 +27,14 @@ int main()
assert(distance(c.begin(), c.end()) == 0); assert(distance(c.begin(), c.end()) == 0);
i = c.insert_after(c.cbefore_begin(), 3, 3); i = c.insert_after(c.cbefore_begin(), 3, 3);
assert(i == c.before_begin()); assert(i == next(c.before_begin(), 3));
assert(distance(c.begin(), c.end()) == 3); assert(distance(c.begin(), c.end()) == 3);
assert(*next(c.begin(), 0) == 3); assert(*next(c.begin(), 0) == 3);
assert(*next(c.begin(), 1) == 3); assert(*next(c.begin(), 1) == 3);
assert(*next(c.begin(), 2) == 3); assert(*next(c.begin(), 2) == 3);
i = c.insert_after(c.begin(), 2, 2); i = c.insert_after(c.begin(), 2, 2);
assert(i == c.begin()); assert(i == next(c.begin(), 2));
assert(distance(c.begin(), c.end()) == 5); assert(distance(c.begin(), c.end()) == 5);
assert(*next(c.begin(), 0) == 3); assert(*next(c.begin(), 0) == 3);
assert(*next(c.begin(), 1) == 2); assert(*next(c.begin(), 1) == 2);