diff options
| author | Bo Yang <teboring@google.com> | 2016-09-19 13:45:07 -0700 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2016-10-10 11:23:36 -0700 |
| commit | cc8ca5b6a5478b40546d4206392eb1471454460d (patch) | |
| tree | c0b45abfa16d7d373a6ea8f7fe50f1de00ab938e /src/google/protobuf/map_entry.h | |
| parent | 337a028bb65ccca4dda768695950b5aba53ae2c9 (diff) | |
| download | protobuf-cc8ca5b6a5478b40546d4206392eb1471454460d.tar.gz protobuf-cc8ca5b6a5478b40546d4206392eb1471454460d.tar.bz2 protobuf-cc8ca5b6a5478b40546d4206392eb1471454460d.zip | |
Integrate internal changes
Diffstat (limited to 'src/google/protobuf/map_entry.h')
| -rw-r--r-- | src/google/protobuf/map_entry.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/map_entry.h b/src/google/protobuf/map_entry.h index e87eda64..abcd4529 100644 --- a/src/google/protobuf/map_entry.h +++ b/src/google/protobuf/map_entry.h @@ -158,8 +158,8 @@ class MapEntry : public MapEntryBase { return entry_lite_.MergePartialFromCodedStream(input); } - int ByteSize() const { - return entry_lite_.ByteSize(); + size_t ByteSizeLong() const { + return entry_lite_.ByteSizeLong(); } void SerializeWithCachedSizes(::google::protobuf::io::CodedOutputStream* output) const { |