mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-12-19 09:05:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

libstdc++: Add missing std::move to ranges::copy/move/reverse_copy [PR101599]

Browse Source 
In passing, this also renames the template parameter _O2 to _Out2 in
ranges::partition_copy and uglifies two of its function parameters,
out_true and out_false.

	PR libstdc++/101599

libstdc++-v3/ChangeLog:

	* include/bits/ranges_algo.h (__reverse_copy_fn::operator()):
	Add missing std::move in return statement.
	(__partition_copy_fn::operator()): Rename templtae parameter
	_O2 to _Out2.  Uglify function parameters out_true and out_false.
	* include/bits/ranges_algobase.h (__copy_or_move): Add missing
	std::move to recursive call that unwraps a __normal_iterator
	output iterator.
	* testsuite/25_algorithms/copy/constrained.cc (test06): New test.
	* testsuite/25_algorithms/move/constrained.cc (test05): New test.
This commit is contained in:
Patrick Palka 2021-08-02 15:30:15 -04:00
parent 4414057186
commit 14d8a5ae47
4 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libstdc++-v3/include/bits/ranges_algo.h
View File

@ -1343,7 +1343,7 @@ namespace ranges
*__result = *__tail;
++__result;
}
return {__i, __result};
return {__i, std::move(__result)};
}
template<bidirectional_range _Range, weakly_incrementable _Out>
@ -2423,14 +2423,14 @@ namespace ranges
struct __partition_copy_fn
{
template<input_iterator _Iter, sentinel_for<_Iter> _Sent,
weakly_incrementable _Out1, weakly_incrementable _O2,
weakly_incrementable _Out1, weakly_incrementable _Out2,
typename _Proj = identity,
indirect_unary_predicate<projected<_Iter, _Proj>> _Pred>
requires indirectly_copyable<_Iter, _Out1>
&& indirectly_copyable<_Iter, _O2>
constexpr partition_copy_result<_Iter, _Out1, _O2>
&& indirectly_copyable<_Iter, _Out2>
constexpr partition_copy_result<_Iter, _Out1, _Out2>
operator()(_Iter __first, _Sent __last,
_Out1 __out_true, _O2 __out_false,
_Out1 __out_true, _Out2 __out_false,
_Pred __pred, _Proj __proj = {}) const
{
for (; __first != __last; ++__first)
@ -2450,18 +2450,18 @@ namespace ranges
}
template<input_range _Range, weakly_incrementable _Out1,
weakly_incrementable _O2,
weakly_incrementable _Out2,
typename _Proj = identity,
indirect_unary_predicate<projected<iterator_t<_Range>, _Proj>>
_Pred>
requires indirectly_copyable<iterator_t<_Range>, _Out1>
&& indirectly_copyable<iterator_t<_Range>, _O2>
constexpr partition_copy_result<borrowed_iterator_t<_Range>, _Out1, _O2>
operator()(_Range&& __r, _Out1 out_true, _O2 out_false,
&& indirectly_copyable<iterator_t<_Range>, _Out2>
constexpr partition_copy_result<borrowed_iterator_t<_Range>, _Out1, _Out2>
operator()(_Range&& __r, _Out1 __out_true, _Out2 __out_false,
_Pred __pred, _Proj __proj = {}) const
{
return (*this)(ranges::begin(__r), ranges::end(__r),
std::move(out_true), std::move(out_false),
std::move(__out_true), std::move(__out_false),
std::move(__pred), std::move(__proj));
}
};

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

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

13
libstdc++-v3/testsuite/25_algorithms/copy/constrained.cc
View File

@ -26,6 +26,7 @@
using __gnu_test::test_container;
using __gnu_test::test_range;
using __gnu_test::input_iterator_wrapper;
using __gnu_test::input_iterator_wrapper_nocopy;
using __gnu_test::output_iterator_wrapper;
using __gnu_test::forward_iterator_wrapper;
@ -214,6 +215,17 @@ test05()
return ok;
}
void
test06()
{
// PR libstdc++/101599
int x[] = {1,2,3};
test_range<int, input_iterator_wrapper_nocopy> rx(x);
std::vector<int> v(4, 0);
ranges::copy(rx, v.begin());
VERIFY( ranges::equal(v, (int[]){1,2,3,0}) );
}
int
main()
{
@ -222,4 +234,5 @@ main()
static_assert(test03());
test04();
static_assert(test05());
test06();
}

13
libstdc++-v3/testsuite/25_algorithms/move/constrained.cc
View File

@ -26,6 +26,7 @@
using __gnu_test::test_container;
using __gnu_test::test_range;
using __gnu_test::input_iterator_wrapper;
using __gnu_test::input_iterator_wrapper_nocopy;
using __gnu_test::output_iterator_wrapper;
using __gnu_test::forward_iterator_wrapper;
@ -193,6 +194,17 @@ test04()
VERIFY( ranges::count(y, 0, &X::moved) == 6 );
}
void
test05()
{
// PR libstdc++/101599
int x[] = {1,2,3};
test_range<int, input_iterator_wrapper_nocopy> rx(x);
std::vector<int> v(4, 0);
ranges::move(rx, v.begin());
VERIFY( ranges::equal(v, (int[]){1,2,3,0}) );
}
int
main()
{
@ -200,4 +212,5 @@ main()
test02();
static_assert(test03());
test04();
test05();
}