Skip to content

Remove PROTOBUF_MAYBE_CONSTEXPR and make the constructor constexpr ev…#8115

Merged
acozzette merged 1 commit intoprotocolbuffers:3.14.xfrom
acozzette:constexpr-fix
Dec 4, 2020
Merged

Remove PROTOBUF_MAYBE_CONSTEXPR and make the constructor constexpr ev…#8115
acozzette merged 1 commit intoprotocolbuffers:3.14.xfrom
acozzette:constexpr-fix

Conversation

@acozzette
Copy link
Copy Markdown

…en in MSVC

This solves a conflict when using Clang for Windows.

This is just a cherry-pick of the internal change cl/341698875.

…en in MSVC

This solves a conflict when using Clang for Windows.

This is just a cherry-pick of the internal change cl/341698875.
@acozzette
Copy link
Copy Markdown
Author

acozzette commented Dec 2, 2020

This should fix an issue that is blocking gRPC from upgrading to 3.14.0: grpc/grpc#24855

@acozzette acozzette merged commit 4a09d77 into protocolbuffers:3.14.x Dec 4, 2020
@acozzette acozzette deleted the constexpr-fix branch December 4, 2020 22:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants