This is an automated email from the ASF dual-hosted git repository.
wwbmmm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brpc.git
The following commit(s) were added to refs/heads/master by this push:
new d22fa17f change protobuf version check for descriptor->extension_range
(#3210)
d22fa17f is described below
commit d22fa17f09514ed42e7b15e0a439827dc8310a8e
Author: Yang,Liming <[email protected]>
AuthorDate: Sat Jan 31 14:19:11 2026 +0800
change protobuf version check for descriptor->extension_range (#3210)
---
src/json2pb/json_to_pb.cpp | 2 +-
src/json2pb/pb_to_json.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/json2pb/json_to_pb.cpp b/src/json2pb/json_to_pb.cpp
index 87fd080a..491ab921 100644
--- a/src/json2pb/json_to_pb.cpp
+++ b/src/json2pb/json_to_pb.cpp
@@ -555,7 +555,7 @@ bool JsonValueToProtoMessage(const
BUTIL_RAPIDJSON_NAMESPACE::Value& json_value,
for (int i = 0; i < descriptor->extension_range_count(); ++i) {
const google::protobuf::Descriptor::ExtensionRange*
ext_range = descriptor->extension_range(i);
-#if GOOGLE_PROTOBUF_VERSION < 4025000
+#if GOOGLE_PROTOBUF_VERSION < 4024000
for (int tag_number = ext_range->start; tag_number < ext_range->end;
++tag_number)
#else
for (int tag_number = ext_range->start_number(); tag_number <
ext_range->end_number(); ++tag_number)
diff --git a/src/json2pb/pb_to_json.cpp b/src/json2pb/pb_to_json.cpp
index b9d01c2a..8e7e4f32 100644
--- a/src/json2pb/pb_to_json.cpp
+++ b/src/json2pb/pb_to_json.cpp
@@ -136,7 +136,7 @@ bool PbToJsonConverter::Convert(const
google::protobuf::Message& message, Handle
for (int i = 0; i < ext_range_count; ++i) {
const google::protobuf::Descriptor::ExtensionRange*
ext_range = descriptor->extension_range(i);
-#if GOOGLE_PROTOBUF_VERSION < 4025000
+#if GOOGLE_PROTOBUF_VERSION < 4024000
for (int tag_number = ext_range->start; tag_number < ext_range->end;
++tag_number)
#else
for (int tag_number = ext_range->start_number(); tag_number <
ext_range->end_number(); ++tag_number)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
