You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@brpc.apache.org by gu...@apache.org on 2022/08/28 08:54:55 UTC
[incubator-brpc] branch master updated: Fix override issue in pb 3.21
This is an automated email from the ASF dual-hosted git repository.
guodong 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 5016afe9 Fix override issue in pb 3.21
new 2b77fbc1 Merge pull request #1909 from wwbmmm/fix-pb-override
5016afe9 is described below
commit 5016afe9d72501776847907d61931738c6f39204
Author: wwbmmm <ww...@163.com>
AuthorDate: Sun Aug 28 15:13:49 2022 +0800
Fix override issue in pb 3.21
---
src/brpc/esp_message.h | 2 +-
src/brpc/memcache.h | 4 ++--
src/brpc/nshead_message.h | 2 +-
src/brpc/pb_compat.h | 6 ++++++
src/brpc/redis.h | 4 ++--
src/brpc/serialized_request.h | 2 +-
6 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/brpc/esp_message.h b/src/brpc/esp_message.h
index ce271d45..279f7b6a 100644
--- a/src/brpc/esp_message.h
+++ b/src/brpc/esp_message.h
@@ -58,7 +58,7 @@ public:
#if GOOGLE_PROTOBUF_VERSION >= 3006000
EspMessage* 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 EspMessage& from);
void MergeFrom(const EspMessage& from);
diff --git a/src/brpc/memcache.h b/src/brpc/memcache.h
index a34ccd60..c6fd2b95 100644
--- a/src/brpc/memcache.h
+++ b/src/brpc/memcache.h
@@ -94,7 +94,7 @@ public:
#if GOOGLE_PROTOBUF_VERSION >= 3006000
MemcacheRequest* 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 MemcacheRequest& from);
void MergeFrom(const MemcacheRequest& from);
@@ -207,7 +207,7 @@ public:
#if GOOGLE_PROTOBUF_VERSION >= 3006000
MemcacheResponse* 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 MemcacheResponse& from);
void MergeFrom(const MemcacheResponse& from);
diff --git a/src/brpc/nshead_message.h b/src/brpc/nshead_message.h
index 475d8ce8..11cc1c60 100644
--- a/src/brpc/nshead_message.h
+++ b/src/brpc/nshead_message.h
@@ -54,7 +54,7 @@ public:
#if GOOGLE_PROTOBUF_VERSION >= 3006000
NsheadMessage* 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 NsheadMessage& from);
void MergeFrom(const NsheadMessage& from);
diff --git a/src/brpc/pb_compat.h b/src/brpc/pb_compat.h
index c9654b75..70faeb54 100644
--- a/src/brpc/pb_compat.h
+++ b/src/brpc/pb_compat.h
@@ -19,6 +19,12 @@
#ifndef BRPC_PB_COMPAT_H
#define BRPC_PB_COMPAT_H
+#if GOOGLE_PROTOBUF_VERSION < 3021000
+# define PB_321_OVERRIDE override
+#else
+# define PB_321_OVERRIDE
+#endif
+
#if GOOGLE_PROTOBUF_VERSION < 3019000
# define PB_319_OVERRIDE override
#else
diff --git a/src/brpc/redis.h b/src/brpc/redis.h
index 035cf70a..d02e8941 100644
--- a/src/brpc/redis.h
+++ b/src/brpc/redis.h
@@ -112,7 +112,7 @@ public:
#if GOOGLE_PROTOBUF_VERSION >= 3006000
RedisRequest* 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 RedisRequest& from);
void MergeFrom(const RedisRequest& from);
@@ -185,7 +185,7 @@ public:
#if GOOGLE_PROTOBUF_VERSION >= 3006000
RedisResponse* 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 RedisResponse& from);
void MergeFrom(const RedisResponse& from);
diff --git a/src/brpc/serialized_request.h b/src/brpc/serialized_request.h
index 6a02e5b2..0fbf76ba 100644
--- a/src/brpc/serialized_request.h
+++ b/src/brpc/serialized_request.h
@@ -48,7 +48,7 @@ public:
#if GOOGLE_PROTOBUF_VERSION >= 3006000
SerializedRequest* 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 CopyFrom(const SerializedRequest& from);
void Clear() override;
bool IsInitialized() const override;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@brpc.apache.org
For additional commands, e-mail: dev-help@brpc.apache.org