-
-
Notifications
You must be signed in to change notification settings - Fork 456
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update set_union.hpp #6638
base: master
Are you sure you want to change the base?
Update set_union.hpp #6638
Conversation
Can one of the admins verify this patch? |
Coverage summary from CodacySee diff coverage on Codacy
Coverage variation details
Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch: Diff coverage details
Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: See your quality gate settings Change summary preferencesCodacy stopped sending the deprecated coverage status on June 5th, 2024. Learn more Footnotes
|
Thanks for this patch. Could you please fix the clan-format errors reported? diff --git a/libs/core/algorithms/include/hpx/parallel/algorithms/set_union.hpp b/libs/core/algorithms/include/hpx/parallel/algorithms/set_union.hpp
index 006ce98..9c08152 100644
--- a/libs/core/algorithms/include/hpx/parallel/algorithms/set_union.hpp
+++ b/libs/core/algorithms/include/hpx/parallel/algorithms/set_union.hpp
@@ -401,7 +401,8 @@ namespace hpx {
static_assert(hpx::traits::is_output_iterator_v<FwdIter3>,
"Requires at least output iterator.");
- using result_type = hpx::parallel::util::in_in_out_result<FwdIter1, FwdIter2, FwdIter3>;
+ using result_type = hpx::parallel::util::in_in_out_result<FwdIter1,
+ FwdIter2, FwdIter3>;
return hpx::parallel::util::get_third_element(
hpx::parallel::detail::set_union<result_type>().call( |
@hkaiser Can you check it now? |
clang-format is still complaining. Please note, our CI uses clang-format v11. This could be the reason for the problems as the tool is not always consistent with itself across versions. Please apply the patch I showed above to work around this. |
Fixes #6631
Proposed Changes
-using result_type = hpx::parallel::util::in_in_out_result<FwdIter1, FwdIter2, FwdIter3>;
Any background context you want to provide?
Checklist
Not all points below apply to all pull requests.