Merge pull request #2830 from wasphin/feature/protobuf-v29

apache · Nov 30, 2024 · 065f797 · 065f797
2 parents b82f2b8 + 8d1ee6d
commit 065f797
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/brpc/nonreflectable_message.h b/src/brpc/nonreflectable_message.h
@@ -51,7 +51,11 @@ class NonreflectableMessage : public ::google::protobuf::Message {
         return *this;
     }
 
-#if GOOGLE_PROTOBUF_VERSION >= 5026000
+#if GOOGLE_PROTOBUF_VERSION >= 5029000
+    const ::google::protobuf::internal::ClassData* GetClassData() const override {
+        return nullptr;
+    }
+#elif GOOGLE_PROTOBUF_VERSION >= 5026000
     const ClassData* GetClassData() const override {
         return nullptr;
     }
@@ -63,7 +67,7 @@ class NonreflectableMessage : public ::google::protobuf::Message {
     }
 #endif
 
-#if GOOGLE_PROTOBUF_VERSION >= 3000000
+#if GOOGLE_PROTOBUF_VERSION >= 3000000 && GOOGLE_PROTOBUF_VERSION < 5029000
     Message* New(::google::protobuf::Arena* arena) const override {
         return ::google::protobuf::Arena::Create<T>(arena);
     }