-
Notifications
You must be signed in to change notification settings - Fork 1.5k
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
Merge main
to feature/flat_set
#4262
Merged
StephanTLavavej
merged 34 commits into
microsoft:feature/flat_set
from
StephanTLavavej:flat_set-vs17.9p2
Dec 14, 2023
Merged
Merge main
to feature/flat_set
#4262
StephanTLavavej
merged 34 commits into
microsoft:feature/flat_set
from
StephanTLavavej:flat_set-vs17.9p2
Dec 14, 2023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Casey Carter <[email protected]> Co-authored-by: Stephan T. Lavavej <[email protected]> Co-authored-by: Jakub Mazurkiewicz <[email protected]>
…ptor closure objects (microsoft#4211)
… values (microsoft#4212) Co-authored-by: Stephan T. Lavavej <[email protected]>
…LWG-3974 (microsoft#4214) Co-authored-by: Casey Carter <[email protected]>
…oft#4217) Co-authored-by: Stephan T. Lavavej <[email protected]>
This is the STL-specific part of internal MSVC-PR-510075.
…arison], and [alg.three.way] (microsoft#4216) Co-authored-by: Stephan T. Lavavej <[email protected]>
… `ranges::is_permutation` (microsoft#4237)
…soft#4249) Co-authored-by: Stephan T. Lavavej <[email protected]>
Conflict in tests/std/tests/include_each_header_alone_matrix.lst, manually merged main's star removal with the addition of flat_set.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This picks up the star removal #4240 and manually merges
tests/std/tests/include_each_header_alone_matrix.lst
which is addingflat_set
to the list. It also picks up the toolset update #4259 and then applies clang-format 17 to avoid stealth merge conflicts; two occurrences ofnoexcept(meow && purr)
are being improved.