Skip to content

Commit b60bcf2

Browse files
authored
Merge pull request STEllAR-GROUP#6644 from AmanpreetS18/AmanpreetS18/issue-6631
Update result_type in set_union.hpp
2 parents 8a3524d + 4f56188 commit b60bcf2

File tree

1 file changed

+7
-7
lines changed
  • libs/core/algorithms/include/hpx/parallel/algorithms

1 file changed

+7
-7
lines changed

libs/core/algorithms/include/hpx/parallel/algorithms/set_union.hpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -279,24 +279,24 @@ namespace hpx::parallel {
279279

280280
if (first1 == last1)
281281
{
282+
// clang-format off
282283
return util::detail::convert_to_result(
283284
detail::copy<util::in_out_result<Iter2, Iter3>>().call(
284285
HPX_FORWARD(ExPolicy, policy), first2, last2, dest),
285286
[first1](util::in_out_result<Iter2, Iter3> const& p)
286-
-> result_type {
287-
return {first1, p.in, p.out};
288-
});
287+
-> result_type { return {first1, p.in, p.out}; });
288+
// clang-format on
289289
}
290290

291291
if (first2 == last2)
292292
{
293+
// clang-format off
293294
return util::detail::convert_to_result(
294295
detail::copy<util::in_out_result<Iter1, Iter3>>().call(
295296
HPX_FORWARD(ExPolicy, policy), first1, last1, dest),
296297
[first2](util::in_out_result<Iter1, Iter3> const& p)
297-
-> result_type {
298-
return {p.in, first2, p.out};
299-
});
298+
-> result_type { return {p.in, first2, p.out}; });
299+
// clang-format on
300300
}
301301

302302
using buffer_type = typename set_operations_buffer<Iter3>::type;
@@ -402,7 +402,7 @@ namespace hpx {
402402
"Requires at least output iterator.");
403403

404404
using result_type = hpx::parallel::util::in_in_out_result<FwdIter1,
405-
FwdIter3, FwdIter3>;
405+
FwdIter2, FwdIter3>;
406406

407407
return hpx::parallel::util::get_third_element(
408408
hpx::parallel::detail::set_union<result_type>().call(

0 commit comments

Comments
 (0)