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.

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

[class.derived.general] Restore accidental reversal of P2662R3 change #6969

Merged
merged 1 commit into from
May 12, 2024

Conversation

jensmaurer
Copy link
Member

P2662R3 contained a rename of the grammar production "class-or-decltype" to "class-or-computed-type-specifier". That was editorially reverted with commit c831ec0, but that commit also accidentally reverted the change from "decltype-specifier" to "computed-type-specifier" as one of the options for "class-or-decltype".

This commit restores the latter change, as intended by P2662R3.

P2662R3 contained a rename of the grammar production "class-or-decltype"
to "class-or-computed-type-specifier".  That was editorially reverted
with commit c831ec0, but that commit
also accidentally reverted the change from "decltype-specifier" to
"computed-type-specifier" as one of the options for "class-or-decltype".

This commit restores the latter change, as intended by P2662R3.
@tkoeppe tkoeppe merged commit be18ecc into cplusplus:main May 12, 2024
2 checks passed
@tkoeppe
Copy link
Contributor

tkoeppe commented May 12, 2024

Thanks!

@jensmaurer jensmaurer deleted the c75 branch May 12, 2024 20:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants