Skip to content

Commit d22fa17

Browse files
authored
change protobuf version check for descriptor->extension_range (#3210)
1 parent c8753e3 commit d22fa17

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/json2pb/json_to_pb.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ bool JsonValueToProtoMessage(const BUTIL_RAPIDJSON_NAMESPACE::Value& json_value,
555555
for (int i = 0; i < descriptor->extension_range_count(); ++i) {
556556
const google::protobuf::Descriptor::ExtensionRange*
557557
ext_range = descriptor->extension_range(i);
558-
#if GOOGLE_PROTOBUF_VERSION < 4025000
558+
#if GOOGLE_PROTOBUF_VERSION < 4024000
559559
for (int tag_number = ext_range->start; tag_number < ext_range->end; ++tag_number)
560560
#else
561561
for (int tag_number = ext_range->start_number(); tag_number < ext_range->end_number(); ++tag_number)

src/json2pb/pb_to_json.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ bool PbToJsonConverter::Convert(const google::protobuf::Message& message, Handle
136136
for (int i = 0; i < ext_range_count; ++i) {
137137
const google::protobuf::Descriptor::ExtensionRange*
138138
ext_range = descriptor->extension_range(i);
139-
#if GOOGLE_PROTOBUF_VERSION < 4025000
139+
#if GOOGLE_PROTOBUF_VERSION < 4024000
140140
for (int tag_number = ext_range->start; tag_number < ext_range->end; ++tag_number)
141141
#else
142142
for (int tag_number = ext_range->start_number(); tag_number < ext_range->end_number(); ++tag_number)

0 commit comments

Comments
 (0)