You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@brpc.apache.org by ji...@apache.org on 2022/08/30 19:51:50 UTC
[incubator-brpc] branch master updated: Fix thrift_message pb override issue
This is an automated email from the ASF dual-hosted git repository.
jiashunzhu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-brpc.git
The following commit(s) were added to refs/heads/master by this push:
new 386ba797 Fix thrift_message pb override issue
new 2ed02ca0 Merge pull request #1913 from wwbmmm/fix-pb-override-thrift
386ba797 is described below
commit 386ba797a1fc7216f05dd82fe4fe46da7279f7d2
Author: wwbmmm <ww...@163.com>
AuthorDate: Tue Aug 30 18:46:29 2022 +0800
Fix thrift_message pb override issue
---
src/brpc/thrift_message.h | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/brpc/thrift_message.h b/src/brpc/thrift_message.h
index e9a7a3af..73716c12 100644
--- 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 @@ public:
// 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 @@ public:
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:
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@brpc.apache.org
For additional commands, e-mail: dev-help@brpc.apache.org