Do not define a const static variable as constexpr. While this is…

… legal it is not supported in all toolchains. Should fix #15030 PiperOrigin-RevId: 592574780
protocolbuffers · Dec 20, 2023 · 35b5648 · 35b5648
1 parent c288343
commit 35b5648
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/google/protobuf/message.cc b/src/google/protobuf/message.cc
@@ -192,9 +192,10 @@ static std::string InitializationErrorStringImpl(const MessageLite& msg) {
   return DownCast<const Message&>(msg).InitializationErrorString();
 }
 
-constexpr MessageLite::DescriptorMethods Message::kDescriptorMethods = {
-    GetTypeNameImpl,
-    InitializationErrorStringImpl,
+PROTOBUF_CONSTINIT const MessageLite::DescriptorMethods
+    Message::kDescriptorMethods = {
+        GetTypeNameImpl,
+        InitializationErrorStringImpl,
 };
 
 namespace internal {