Merge pull request apache#1913 from wwbmmm/fix-pb-override-thrift

Fix thrift_message pb override issue
Huixxi · Aug 30, 2022 · 2ed02ca · 2ed02ca
2 parents df031be + 386ba79
commit 2ed02ca
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/brpc/thrift_message.h b/src/brpc/thrift_message.h
@@ -25,6 +25,7 @@
 #include "brpc/channel_base.h"
 #include "brpc/controller.h"
 #include "brpc/proto_base.pb.h"
+#include "brpc/pb_compat.h"
 
 namespace apache {
 namespace thrift {
@@ -83,11 +84,11 @@ friend class ThriftStub;
 
     // implements Message ----------------------------------------------
 
-    ThriftFramedMessage* New() const override;
+    ThriftFramedMessage* New() const PB_319_OVERRIDE;
 #if GOOGLE_PROTOBUF_VERSION >= 3006000
     ThriftFramedMessage* New(::google::protobuf::Arena* arena) const override;
 #endif
-    void CopyFrom(const ::google::protobuf::Message& from) override;
+    void CopyFrom(const ::google::protobuf::Message& from) PB_321_OVERRIDE;
     void MergeFrom(const ::google::protobuf::Message& from) override;
     void CopyFrom(const ThriftFramedMessage& from);
     void MergeFrom(const ThriftFramedMessage& from);
@@ -96,10 +97,10 @@ friend class ThriftStub;
 
     int ByteSize() const;
     bool MergePartialFromCodedStream(
-        ::google::protobuf::io::CodedInputStream* input) override;
+        ::google::protobuf::io::CodedInputStream* input) PB_310_OVERRIDE;
     void SerializeWithCachedSizes(
-        ::google::protobuf::io::CodedOutputStream* output) const override;
-    ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const override;
+        ::google::protobuf::io::CodedOutputStream* output) const PB_310_OVERRIDE;
+    ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const PB_310_OVERRIDE;
     int GetCachedSize() const override { return ByteSize(); }
 
 protected: