Skip to content

Merge main to feature/flat_map#4368

Merged
StephanTLavavej merged 19 commits intomicrosoft:feature/flat_mapfrom
StephanTLavavej:merge-flat_map
Feb 7, 2024
Merged

Merge main to feature/flat_map#4368
StephanTLavavej merged 19 commits intomicrosoft:feature/flat_mapfrom
StephanTLavavej:merge-flat_map

Conversation

@StephanTLavavej
Copy link
Member

⚠️ Commit as a merge, not as a squash!

  • Merge main to feature/flat_map
    • Resolved conflict in yvals_core.h.
  • Update _HAS_CXX23 guard in <flat_map>.
  • Add a feature-test macro test.
  • Add flat_map to P1502R1_standard_library_header_units.
  • std.ixx: Guard <flat_map> with _HAS_CXX23.
  • Add flat_map to include_each_header_alone_matrix.lst.

cpplearner and others added 19 commits February 1, 2024 15:23
Co-authored-by: Casey Carter <cacarter@microsoft.com>
Co-authored-by: Stephan T. Lavavej <stl@nuwen.net>
Co-authored-by: Stephan T. Lavavej <stl@nuwen.net>
Co-authored-by: Casey Carter <cacarter@microsoft.com>
Co-authored-by: Stephan T. Lavavej <stl@nuwen.net>
Co-authored-by: Stephan T. Lavavej <stl@nuwen.net>
Resolved conflict in yvals_core.h.
@StephanTLavavej StephanTLavavej added the flat_meow C++23 container adaptors label Feb 6, 2024
@StephanTLavavej StephanTLavavej requested a review from a team as a code owner February 6, 2024 22:56
@StephanTLavavej StephanTLavavej merged commit 8a52d0c into microsoft:feature/flat_map Feb 7, 2024
@StephanTLavavej StephanTLavavej deleted the merge-flat_map branch February 7, 2024 00:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

flat_meow C++23 container adaptors

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants