diff --git a/libstdc++-v3/include/bits/stl_bvector.h b/libstdc++-v3/include/bits/stl_bvector.h index 961e4a252996276266809f9709706fd0f2f4130e..2292eec54ad748c33b28a30a164a4214933c6f4b 100644 --- a/libstdc++-v3/include/bits/stl_bvector.h +++ b/libstdc++-v3/include/bits/stl_bvector.h @@ -1341,9 +1341,9 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER std::copy_backward(__pos._M_const_cast(), end(), this->_M_impl._M_finish + difference_type(__n)); - auto __i = ranges::copy(__rg, __pos._M_const_cast()).out; + ranges::copy(__rg, __pos._M_const_cast()); this->_M_impl._M_finish += difference_type(__n); - return __i; + return __pos._M_const_cast(); } else { @@ -1355,9 +1355,9 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER iterator __i = _M_copy_aligned(__begin, __pos._M_const_cast(), __start); - __i = ranges::copy(__rg, __i).out; + iterator __j = ranges::copy(__rg, __i).out; iterator __finish = std::copy(__pos._M_const_cast(), - __end, __i); + __end, __j); this->_M_deallocate(); this->_M_impl._M_end_of_storage = __q + _S_nword(__len); this->_M_impl._M_start = __start; diff --git a/libstdc++-v3/include/bits/vector.tcc b/libstdc++-v3/include/bits/vector.tcc index 4f4c366080bea216252f49b9c3a29231fce60feb..acb2f5fca1e779c4788adcbb00feaa586eb05305 100644 --- a/libstdc++-v3/include/bits/vector.tcc +++ b/libstdc++-v3/include/bits/vector.tcc @@ -984,8 +984,9 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER { if (__pos == cend()) { + const auto __ins_idx = size(); append_range(std::forward<_Rg>(__rg)); - return end(); + return begin() + __ins_idx; } if constexpr (ranges::forward_range<_Rg>) diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/insert/insert_range.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/insert/insert_range.cc index 4f4835746ea44c1204d67617782f589a6773e7fb..5c65610667d5066d44189083ccbc770e95c61a55 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/insert/insert_range.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/insert/insert_range.cc @@ -35,16 +35,22 @@ do_test() VERIFY( eq(v, a) ); v.clear(); v.shrink_to_fit(); - v.insert_range(v.begin(), Range(a, a+3)); - v.insert_range(v.end(), Range(a+6, a+9)); - v.insert_range(v.begin()+3, Range(a+3, a+6)); + auto it = v.insert_range(v.begin(), Range(a, a+3)); + VERIFY( it == v.begin() ); + it = v.insert_range(v.end(), Range(a+6, a+9)); + VERIFY( it == v.begin()+3 ); + it = v.insert_range(v.begin()+3, Range(a+3, a+6)); + VERIFY( it == v.begin()+3 ); VERIFY( eq(v, a) ); v.resize(3); - v.insert_range(v.begin()+1, Range(a+4, a+9)); - v.insert_range(v.begin()+1, Range(a+1, a+4)); + it = v.insert_range(v.begin()+1, Range(a+4, a+9)); + VERIFY( it == v.begin()+1 ); + it = v.insert_range(v.begin()+1, Range(a+1, a+4)); + VERIFY( it == v.begin()+1 ); v.resize(9); VERIFY( eq(v, a) ); - v.insert_range(v.begin(), Range(a, a)); + it = v.insert_range(v.begin(), Range(a, a)); + VERIFY( it == v.begin() ); VERIFY( eq(v, a) ); } diff --git a/libstdc++-v3/testsuite/23_containers/vector/modifiers/insert/insert_range.cc b/libstdc++-v3/testsuite/23_containers/vector/modifiers/insert/insert_range.cc index 68218e94f28b28060f37a24071eab226d24ad41d..5907143512676a8cd66596f1543a68a60a255ecc 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/modifiers/insert/insert_range.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/modifiers/insert/insert_range.cc @@ -39,16 +39,22 @@ do_test() VERIFY( eq(v, a) ); v.clear(); v.shrink_to_fit(); - v.insert_range(v.begin(), Range(a, a+3)); - v.insert_range(v.end(), Range(a+6, a+9)); - v.insert_range(v.begin()+3, Range(a+3, a+6)); + auto it = v.insert_range(v.begin(), Range(a, a+3)); + VERIFY( it == v.begin() ); + it = v.insert_range(v.end(), Range(a+6, a+9)); + VERIFY( it == v.begin()+3 ); + it = v.insert_range(v.begin()+3, Range(a+3, a+6)); + VERIFY( it == v.begin()+3 ); VERIFY( eq(v, a) ); v.resize(3); - v.insert_range(v.begin()+1, Range(a+4, a+9)); - v.insert_range(v.begin()+1, Range(a+1, a+4)); + it = v.insert_range(v.begin()+1, Range(a+4, a+9)); + VERIFY( it == v.begin()+1 ); + it = v.insert_range(v.begin()+1, Range(a+1, a+4)); + VERIFY( it == v.begin()+1 ); v.resize(9); VERIFY( eq(v, a) ); - v.insert_range(v.begin() + 6, Range(a, a)); + it = v.insert_range(v.begin() + 6, Range(a, a)); + VERIFY( it == v.begin() + 6 ); VERIFY( eq(v, a) ); }