Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Making set algorithms conform to C++20 #4970

Merged
merged 10 commits into from
Sep 24, 2020
Merged

Making set algorithms conform to C++20 #4970

merged 10 commits into from
Sep 24, 2020

Conversation

hkaiser
Copy link
Member

@hkaiser hkaiser commented Sep 19, 2020 •
edited
Loading

This PR make sure the following algorithms conform to C++20

  • set_intersection
  • set_difference
  • set_symmetric_difference
  • set_union
  • includes
  • merge
  • inplace_merge

@hkaiser hkaiser added this to the 1.6.0 milestone Sep 19, 2020
This was referenced Sep 19, 2020
Closed
Closed
Closed
@hkaiser hkaiser force-pushed the set_algorithms branch 2 times, most recently from 898f51d to d8c1e9a Compare September 20, 2020 14:32
@hkaiser hkaiser marked this pull request as ready for review September 20, 2020 21:50
@msimberg
Copy link
Contributor

This looks like it might be related to the changes here: https://cdash.cscs.ch/testDetails.php?test=28421628&build=127919 (the same test fails with some other configurations as well)?

@hkaiser
Copy link
Member Author

hkaiser commented Sep 21, 2020

This looks like it might be related to the changes here: https://cdash.cscs.ch/testDetails.php?test=28421628&build=127919 (the same test fails with some other configurations as well)?

Yep, looks like I managed to break things. I'll investigate.

@hkaiser hkaiser force-pushed the set_algorithms branch 2 times, most recently from f26037c to 82e8802 Compare September 21, 2020 19:23
@hkaiser
Copy link
Member Author

hkaiser commented Sep 21, 2020

This looks like it might be related to the changes here: https://cdash.cscs.ch/testDetails.php?test=28421628&build=127919 (the same test fails with some other configurations as well)?

Yep, looks like I managed to break things. I'll investigate.

@msimberg this should be fine now. I also managed to find a bug in hpx::includes that was there from the beginning \o/

@hkaiser
Copy link
Member Author

hkaiser commented Sep 22, 2020

Please note that I will add another commit here that will make merge and inplace_merge conforming to c++20.

@hkaiser
Making set_intersection conform to C++20
387ed5a 
- adding range-based overloads
@hkaiser
Making includes conforming to C++20
15e95f4
@hkaiser
Make set_difference conform to C++20
b40be86
@hkaiser
set_symmetric_difference and set_union adaptations for C++20
97984f1 
- fixing set_operations to use projections
- fixing includes (lower_bound/upper_bound use projections)
- fixing return values for all set operations
- adding range algorithms to docs
@hkaiser
Making merge and inplace_merge conforming to C++20
d93b91a
@hkaiser
Fixing merge conflicts, fix remaining old is_execution_policy uses
599d88e
@hkaiser
Copy link
Member Author

hkaiser commented Sep 22, 2020

@msimberg this should be fine now. Sorry for the large number of seemingly unrelated changes, apparently I did miss a couple of places when moving is_execution_policy to namespace hpx...

@hkaiser
Adding overload for merge and inplace_merge to ranges namespace
b843341 
- flyby: make projection_identity conform to C++20
@msimberg
Copy link
Contributor

@msimberg this should be fine now. Sorry for the large number of seemingly unrelated changes, apparently I did miss a couple of places when moving is_execution_policy to namespace hpx...

No problem at all, they're not so easy to catch without the warnings. Thanks for doing this!

hkaiser and others added 2 commits September 23, 2020 07:35
@hkaiser @msimberg
Update libs/parallelism/algorithms/tests/unit/container_algorithms/in…
b686cfd 
…place_merge_range.cpp

Co-authored-by: Mikael Simberg <mikael.simberg@iki.fi>
@hkaiser
Fixing clang-format issue
c60c5e4
@hkaiser
Copy link
Member Author

hkaiser commented Sep 24, 2020

@msimberg I think this is good to go now.

@msimberg msimberg merged commit 3a49547 into master Sep 24, 2020
@msimberg msimberg deleted the set_algorithms branch September 24, 2020 12:14
@hkaiser hkaiser mentioned this pull request Jul 9, 2021
Closed
30 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@msimberg msimberg msimberg requested changes

@aurianer aurianer Awaiting requested review from aurianer

@biddisco biddisco Awaiting requested review from biddisco

Assignees
No one assigned
Labels
category: algorithms type: compatibility issue type: enhancement
Projects
None yet
Milestone
1.6.0
Development

Successfully merging this pull request may close these issues.
2 participants
@hkaiser @msimberg