From 296b27210fb92c8b1c509e9c7298df011d6f4474 Mon Sep 17 00:00:00 2001 From: Yang Liming Date: Fri, 30 Jan 2026 13:24:56 +0800 Subject: [PATCH] change protobuf version check for descriptor->extension_range --- 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 87fd080a15..491ab92116 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 b9d01c2a94..8e7e4f32e3 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)