Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix compile error in generated_message_util.cc

Browse Source
pull/5142/head
Jeffrey Walton 6 years ago
parent 5193bedb41
commit be14bf2b78
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 8 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      src/google/protobuf/generated_message_util.cc

14
src/google/protobuf/generated_message_util.cc
Unescape View File

@ -620,6 +620,7 @@ bool IsNull<FieldMetadata::kInlinedType>(const void* ptr) {
void SerializeInternal(const uint8* base, void SerializeInternal(const uint8* base,
const FieldMetadata* field_metadata_table, const FieldMetadata* field_metadata_table,
int32 num_fields, io::CodedOutputStream* output) { int32 num_fields, io::CodedOutputStream* output) {
SpecialSerializer func = nullptr;
for (int i = 0; i < num_fields; i++) { for (int i = 0; i < num_fields; i++) {
const FieldMetadata& field_metadata = field_metadata_table[i]; const FieldMetadata& field_metadata = field_metadata_table[i];
const uint8* ptr = base + field_metadata.offset; const uint8* ptr = base + field_metadata.offset;
@ -646,9 +647,9 @@ void SerializeInternal(const uint8* base,
// Special cases // Special cases
case FieldMetadata::kSpecial: case FieldMetadata::kSpecial:
reinterpret_cast<SpecialSerializer>( func = reinterpret_cast<SpecialSerializer>(
const_cast<void*>(field_metadata.ptr))( const_cast<void*>(field_metadata.ptr));
base, field_metadata.offset, field_metadata.tag, func (base, field_metadata.offset, field_metadata.tag,
field_metadata.has_offset, output); field_metadata.has_offset, output);
break; break;
default: default:
@ -664,6 +665,7 @@ uint8* SerializeInternalToArray(const uint8* base,
uint8* buffer) { uint8* buffer) {
ArrayOutput array_output = {buffer, is_deterministic}; ArrayOutput array_output = {buffer, is_deterministic};
ArrayOutput* output = &array_output; ArrayOutput* output = &array_output;
SpecialSerializer func = nullptr;
for (int i = 0; i < num_fields; i++) { for (int i = 0; i < num_fields; i++) {
const FieldMetadata& field_metadata = field_metadata_table[i]; const FieldMetadata& field_metadata = field_metadata_table[i];
const uint8* ptr = base + field_metadata.offset; const uint8* ptr = base + field_metadata.offset;
@ -692,9 +694,9 @@ uint8* SerializeInternalToArray(const uint8* base,
io::ArrayOutputStream array_stream(array_output.ptr, INT_MAX); io::ArrayOutputStream array_stream(array_output.ptr, INT_MAX);
io::CodedOutputStream output(&array_stream); io::CodedOutputStream output(&array_stream);
output.SetSerializationDeterministic(is_deterministic); output.SetSerializationDeterministic(is_deterministic);
reinterpret_cast<SpecialSerializer>( func = reinterpret_cast<SpecialSerializer>(
const_cast<void*>(field_metadata.ptr))( const_cast<void*>(field_metadata.ptr));
base, field_metadata.offset, field_metadata.tag, func (base, field_metadata.offset, field_metadata.tag,
field_metadata.has_offset, &output); field_metadata.has_offset, &output);
array_output.ptr += output.ByteCount(); array_output.ptr += output.ByteCount();
} break; } break;

Write Preview
Loading…
Cancel
Save