Skip to content

Conversation

@StephanTLavavej
Copy link
Member

@StephanTLavavej StephanTLavavej commented Feb 20, 2021

This merges main into feature/spaceship to pick up #1602.

Only tests/std/tests/P1614R2_spaceship/test.cpp had to be manually resolved.

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

Michael S. Rizkalla and others added 6 commits February 17, 2021 18:53
…ent (microsoft#1629)

Co-authored-by: Casey Carter <cacarter@microsoft.com>
Co-authored-by: Igor Zhukov <4289847+fsb4000@users.noreply.github.com>
Co-authored-by: S. B. Tam <8998201+cpplearner@users.noreply.github.com>
Co-authored-by: Stephan T. Lavavej <stl@nuwen.net>
Co-authored-by: Stephan T. Lavavej <stl@nuwen.net>
Co-authored-by: Stephan T. Lavavej <stl@nuwen.net>
Co-Authored-By: Adam Bucior <35536269+AdamBucior@users.noreply.github.com>
Co-Authored-By: Berrysoft <37586447+Berrysoft@users.noreply.github.com>
Co-Authored-By: Michael Schellenberger Costa <mschellenbergercosta@googlemail.com>
Co-authored-by: Stephan T. Lavavej <stl@microsoft.com>
@StephanTLavavej StephanTLavavej added test Related to test code spaceship C++20 operator <=> labels Feb 20, 2021
@StephanTLavavej StephanTLavavej requested a review from a team as a code owner February 20, 2021 23:27
@StephanTLavavej StephanTLavavej merged commit 467780d into microsoft:feature/spaceship Feb 22, 2021
@StephanTLavavej StephanTLavavej deleted the merge_spaceship branch February 22, 2021 20:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

spaceship C++20 operator <=> test Related to test code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants