diff options
author | theraven <theraven@FreeBSD.org> | 2013-02-07 15:45:28 +0000 |
---|---|---|
committer | theraven <theraven@FreeBSD.org> | 2013-02-07 15:45:28 +0000 |
commit | d19c702291ff3bd9e769a152e7db96e17f5167f7 (patch) | |
tree | 52637438fa031aa783147d9ac30dac90131dffdf /contrib/libc++/include/vector | |
parent | 0ab90cb3f6b7aa6a5a725c5aadaee31d34eaca96 (diff) | |
download | FreeBSD-src-d19c702291ff3bd9e769a152e7db96e17f5167f7.zip FreeBSD-src-d19c702291ff3bd9e769a152e7db96e17f5167f7.tar.gz |
Import new libc++ to head. Various small fixes and cleanups.
MFC after: 2 weeks
Diffstat (limited to 'contrib/libc++/include/vector')
-rw-r--r-- | contrib/libc++/include/vector | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/libc++/include/vector b/contrib/libc++/include/vector index 0c28068..876b7e5 100644 --- a/contrib/libc++/include/vector +++ b/contrib/libc++/include/vector @@ -1458,7 +1458,8 @@ vector<_Tp, _Allocator>::__push_back_slow_path(_Up& __x) allocator_type& __a = this->__alloc(); __split_buffer<value_type, allocator_type&> __v(__recommend(size() + 1), size(), __a); // __v.push_back(_VSTD::forward<_Up>(__x)); - __alloc_traits::construct(__a, _VSTD::__to_raw_pointer(__v.__end_++), _VSTD::forward<_Up>(__x)); + __alloc_traits::construct(__a, _VSTD::__to_raw_pointer(__v.__end_), _VSTD::forward<_Up>(__x)); + __v.__end_++; __swap_out_circular_buffer(__v); } @@ -1505,7 +1506,8 @@ vector<_Tp, _Allocator>::__emplace_back_slow_path(_Args&&... __args) allocator_type& __a = this->__alloc(); __split_buffer<value_type, allocator_type&> __v(__recommend(size() + 1), size(), __a); // __v.emplace_back(_VSTD::forward<_Args>(__args)...); - __alloc_traits::construct(__a, _VSTD::__to_raw_pointer(__v.__end_++), _VSTD::forward<_Args>(__args)...); + __alloc_traits::construct(__a, _VSTD::__to_raw_pointer(__v.__end_), _VSTD::forward<_Args>(__args)...); + __v.__end_++; __swap_out_circular_buffer(__v); } |