Index: third_party/protobuf/src/google/protobuf/wire_format.cc |
diff --git a/third_party/protobuf/src/google/protobuf/wire_format.cc b/third_party/protobuf/src/google/protobuf/wire_format.cc |
index 88a1a2349573326aebfb134e1a7ae3a7e5b64a3c..5ee4e25d4935be7a542ff5534ae06a7baaae8d4d 100644 |
--- a/third_party/protobuf/src/google/protobuf/wire_format.cc |
+++ b/third_party/protobuf/src/google/protobuf/wire_format.cc |
@@ -307,9 +307,9 @@ uint8* WireFormat::SerializeUnknownMessageSetItemsToArray( |
return target; |
} |
-size_t WireFormat::ComputeUnknownFieldsSize( |
+int WireFormat::ComputeUnknownFieldsSize( |
const UnknownFieldSet& unknown_fields) { |
- size_t size = 0; |
+ int size = 0; |
for (int i = 0; i < unknown_fields.field_count(); i++) { |
const UnknownField& field = unknown_fields.field(i); |
@@ -355,9 +355,9 @@ size_t WireFormat::ComputeUnknownFieldsSize( |
return size; |
} |
-size_t WireFormat::ComputeUnknownMessageSetItemsSize( |
+int WireFormat::ComputeUnknownMessageSetItemsSize( |
const UnknownFieldSet& unknown_fields) { |
- size_t size = 0; |
+ int size = 0; |
for (int i = 0; i < unknown_fields.field_count(); i++) { |
const UnknownField& field = unknown_fields.field(i); |
@@ -792,7 +792,7 @@ void WireFormat::SerializeWithCachedSizes( |
const Reflection* message_reflection = message.GetReflection(); |
int expected_endpoint = output->ByteCount() + size; |
- std::vector<const FieldDescriptor*> fields; |
+ vector<const FieldDescriptor*> fields; |
message_reflection->ListFields(message, &fields); |
for (int i = 0; i < fields.size(); i++) { |
SerializeFieldWithCachedSizes(fields[i], message, output); |
@@ -838,7 +838,7 @@ void WireFormat::SerializeFieldWithCachedSizes( |
if (is_packed && count > 0) { |
WireFormatLite::WriteTag(field->number(), |
WireFormatLite::WIRETYPE_LENGTH_DELIMITED, output); |
- const size_t data_size = FieldDataOnlyByteSize(field, message); |
+ const int data_size = FieldDataOnlyByteSize(field, message); |
output->WriteVarint32(data_size); |
} |
@@ -964,13 +964,13 @@ void WireFormat::SerializeMessageSetItemWithCachedSizes( |
// =================================================================== |
-size_t WireFormat::ByteSize(const Message& message) { |
+int WireFormat::ByteSize(const Message& message) { |
const Descriptor* descriptor = message.GetDescriptor(); |
const Reflection* message_reflection = message.GetReflection(); |
- size_t our_size = 0; |
+ int our_size = 0; |
- std::vector<const FieldDescriptor*> fields; |
+ vector<const FieldDescriptor*> fields; |
message_reflection->ListFields(message, &fields); |
for (int i = 0; i < fields.size(); i++) { |
our_size += FieldByteSize(fields[i], message); |
@@ -987,7 +987,7 @@ size_t WireFormat::ByteSize(const Message& message) { |
return our_size; |
} |
-size_t WireFormat::FieldByteSize( |
+int WireFormat::FieldByteSize( |
const FieldDescriptor* field, |
const Message& message) { |
const Reflection* message_reflection = message.GetReflection(); |
@@ -999,15 +999,15 @@ size_t WireFormat::FieldByteSize( |
return MessageSetItemByteSize(field, message); |
} |
- size_t count = 0; |
+ int count = 0; |
if (field->is_repeated()) { |
- count = FromIntSize(message_reflection->FieldSize(message, field)); |
+ count = message_reflection->FieldSize(message, field); |
} else if (message_reflection->HasField(message, field)) { |
count = 1; |
} |
- const size_t data_size = FieldDataOnlyByteSize(field, message); |
- size_t our_size = data_size; |
+ const int data_size = FieldDataOnlyByteSize(field, message); |
+ int our_size = data_size; |
if (field->is_packed()) { |
if (data_size > 0) { |
// Packed fields get serialized like a string, not their native type. |
@@ -1022,20 +1022,19 @@ size_t WireFormat::FieldByteSize( |
return our_size; |
} |
-size_t WireFormat::FieldDataOnlyByteSize( |
+int WireFormat::FieldDataOnlyByteSize( |
const FieldDescriptor* field, |
const Message& message) { |
const Reflection* message_reflection = message.GetReflection(); |
- size_t count = 0; |
+ int count = 0; |
if (field->is_repeated()) { |
- count = |
- internal::FromIntSize(message_reflection->FieldSize(message, field)); |
+ count = message_reflection->FieldSize(message, field); |
} else if (message_reflection->HasField(message, field)) { |
count = 1; |
} |
- size_t data_size = 0; |
+ int data_size = 0; |
switch (field->type()) { |
#define HANDLE_TYPE(TYPE, TYPE_METHOD, CPPTYPE_METHOD) \ |
case FieldDescriptor::TYPE_##TYPE: \ |
@@ -1109,19 +1108,19 @@ size_t WireFormat::FieldDataOnlyByteSize( |
return data_size; |
} |
-size_t WireFormat::MessageSetItemByteSize( |
+int WireFormat::MessageSetItemByteSize( |
const FieldDescriptor* field, |
const Message& message) { |
const Reflection* message_reflection = message.GetReflection(); |
- size_t our_size = WireFormatLite::kMessageSetItemTagsSize; |
+ int our_size = WireFormatLite::kMessageSetItemTagsSize; |
// type_id |
our_size += io::CodedOutputStream::VarintSize32(field->number()); |
// message |
const Message& sub_message = message_reflection->GetMessage(message, field); |
- size_t message_size = sub_message.ByteSizeLong(); |
+ int message_size = sub_message.ByteSize(); |
our_size += io::CodedOutputStream::VarintSize32(message_size); |
our_size += message_size; |