| Index: third_party/protobuf/src/google/protobuf/map_entry.h
|
| diff --git a/third_party/protobuf/src/google/protobuf/map_entry.h b/third_party/protobuf/src/google/protobuf/map_entry.h
|
| index 987c4e297c8aa467c2dd125327734951a77cfaa8..abcd45290ae8c666fbe7ed8f1ac41f8476b96a2d 100644
|
| --- a/third_party/protobuf/src/google/protobuf/map_entry.h
|
| +++ b/third_party/protobuf/src/google/protobuf/map_entry.h
|
| @@ -83,7 +83,7 @@ class LIBPROTOBUF_EXPORT MapEntryBase : public Message {
|
| // reflection, its in-memory type is the same as generated message with the same
|
| // fields. However, in order to decide the in-memory type of key/value, we need
|
| // to know both their cpp type in generated api and proto type. In
|
| -// implmentation, all in-memory types have related wire format functions to
|
| +// implementation, all in-memory types have related wire format functions to
|
| // support except ArenaStringPtr. Therefore, we need to define another type with
|
| // supporting wire format functions. Since this type is only used as return type
|
| // of MapEntry accessors, it's named MapEntry accessor type.
|
| @@ -158,16 +158,18 @@ 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 {
|
| entry_lite_.SerializeWithCachedSizes(output);
|
| }
|
|
|
| - ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {
|
| - return entry_lite_.SerializeWithCachedSizesToArray(output);
|
| + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(bool deterministic,
|
| + ::google::protobuf::uint8* output) const {
|
| + return entry_lite_.InternalSerializeWithCachedSizesToArray(deterministic,
|
| + output);
|
| }
|
|
|
| int GetCachedSize() const {
|
|
|