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

<flat_map>: Fix overloads and complete deduction guides and erase_if, with cleanups #4337

Merged
merged 11 commits into from
Jan 25, 2024
Merged

<flat_map>: Fix overloads and complete deduction guides and erase_if, with cleanups #4337

merged 11 commits into from
Jan 25, 2024

Conversation

frederick-vs-ja
Copy link
Contributor

@frederick-vs-ja frederick-vs-ja commented Jan 22, 2024 •
edited
Loading

Towards #2910.

Feature completion:

  • Deduction guides of flat_multimap (with those of flat_map corrected).
  • erase_if.

Correction:

  • Overloads of some functions.
  • Moving flat_map-specific functions (at etc.) to the derived class body.
  • _Uglification of internal names.

Cleanups:

Enhancements:

  • SCARY iterators.

TODO (in following PRs):

  • Correcting some function bodies.
  • Completing tests.
  • Optimization of emplace and its friends.

@frederick-vs-ja
Name cleanups for <flat_map>
8f5b0dc 
- Consistently use `_UglyCamelCase` for template arguments.
- Consistently use `_Ugly_snake_case` for other stuffs.
- Consistently use `_Meow_provider` for SCARY & ADL-proof layers.
- Replace `_X`, `_K` etc. and a non-_Uglified `R`.
- Replace `_Paring_meow` with `_Pairing_meow`
@frederick-vs-ja
Cleanup for P0429R9_flat_map/test.cpp
6aef753 
- Get rid of `&=` on `bool`.
- Make comparison operator defaulted as possible.
@frederick-vs-ja
Try to fix overloads for flat_map/flat_multi_map
c7bc657 
And fix some bad names.
@frederick-vs-ja
Fix and complete deduction guides
bb8280e 
And replace the non-uglified name `Allocator` with `_Allocator`
@frederick-vs-ja
Missed fixes
d6083c1
@frederick-vs-ja
Implement erase_if!
83699c7
@frederick-vs-ja
Implement SCARY iterators
1beb7f0
@frederick-vs-ja
Ensure that _Erase_if from the base class is made private
f6b46c7
@frederick-vs-ja frederick-vs-ja requested a review from a team as a code owner January 22, 2024 23:27
@StephanTLavavej StephanTLavavej added the flat_meow C++23 container adaptors label Jan 22, 2024
@frederick-vs-ja frederick-vs-ja changed the title <flat_map>: Fix of overloads, complete deduction guides and erase_if, with cleanups <flat_map>: Fix overloads and complete deduction guides and erase_if, with cleanups Jan 23, 2024
@StephanTLavavej StephanTLavavej self-assigned this Jan 23, 2024
StephanTLavavej
StephanTLavavej approved these changes Jan 25, 2024
View reviewed changes
stl/inc/flat_map Show resolved Hide resolved
stl/inc/flat_map Show resolved Hide resolved
stl/inc/flat_map Show resolved Hide resolved
stl/inc/flat_map Show resolved Hide resolved
stl/inc/flat_map Show resolved Hide resolved
stl/inc/flat_map Show resolved Hide resolved
stl/inc/flat_map Show resolved Hide resolved
stl/inc/flat_map Show resolved Hide resolved
stl/inc/flat_map Show resolved Hide resolved
tests/std/tests/P0429R9_flat_map/test.cpp Show resolved Hide resolved
@StephanTLavavej StephanTLavavej merged commit 00c2324 into microsoft:feature/flat_map Jan 25, 2024
35 checks passed
@StephanTLavavej
Copy link
Member

Thanks! I have a bunch of comments for followup, but nothing that blocked merging. 😻

@frederick-vs-ja frederick-vs-ja deleted the flat_map-overloads-fix branch January 25, 2024 12:23
@frederick-vs-ja frederick-vs-ja mentioned this pull request Jan 25, 2024
Merged
@frederick-vs-ja frederick-vs-ja mentioned this pull request Feb 11, 2024
Merged
@frederick-vs-ja frederick-vs-ja mentioned this pull request Mar 10, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@StephanTLavavej StephanTLavavej StephanTLavavej approved these changes

Assignees

@StephanTLavavej StephanTLavavej

Labels
flat_meow C++23 container adaptors
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@frederick-vs-ja @StephanTLavavej