procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libstdc++: Add missing move in ranges::copy

Browse source 
This is needed to support a move-only output iterator when the input
iterators are specializations of __normal_iterator.

libstdc++-v3/ChangeLog:

	* include/bits/ranges_algobase.h (__detail::__copy_or_move):
	Move output iterator.
	* testsuite/25_algorithms/copy/constrained.cc: Check copying to
	move-only output iterator.
This commit is contained in:
Jonathan Wakely 2022-11-03 09:17:57 +00:00
parent f95e4eced2
commit 2ff0e62275
2 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libstdc++-v3/include/bits/ranges_algobase.h
View file

@ -239,7 +239,7 @@ namespace ranges
{
auto [__in,__out]
= ranges::__copy_or_move<_IsMove>(__first.base(), __last.base(),
__result);
std::move(__result));
return {decltype(__first){__in}, std::move(__out)};
}
else if constexpr (__is_normal_iterator<_Out>)

24
libstdc++-v3/testsuite/25_algorithms/copy/constrained.cc
View file

@ -226,6 +226,29 @@ test06()
VERIFY( ranges::equal(v, (int[]){1,2,3,0}) );
}
void
test07()
{
struct move_only_output_iterator
{
using value_type = int;
using difference_type = short;
using iterator_category = std::output_iterator_tag;
move_only_output_iterator() = default;
move_only_output_iterator(move_only_output_iterator&&) = default;
move_only_output_iterator& operator=(move_only_output_iterator&&) = default;
move_only_output_iterator& operator*() { return *this; }
move_only_output_iterator& operator++() { return *this; }
move_only_output_iterator operator++(int) { return std::move(*this); }
void operator=(int) { }
};
ranges::copy(std::vector<int>{1,2,3}, move_only_output_iterator{});
}
int
main()
{
@ -235,4 +258,5 @@ main()
test04();
static_assert(test05());
test06();
test07();
}