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_type_handler.h | |
| parent | 337a028bb65ccca4dda768695950b5aba53ae2c9 (diff) | |
Integrate internal changes
Diffstat (limited to 'src/google/protobuf/map_type_handler.h')
| -rw-r--r-- | src/google/protobuf/map_type_handler.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/map_type_handler.h b/src/google/protobuf/map_type_handler.h index 685a770f..a21c92d9 100644 --- a/src/google/protobuf/map_type_handler.h +++ b/src/google/protobuf/map_type_handler.h @@ -158,7 +158,7 @@ class MapTypeHandler<WireFormatLite::TYPE_MESSAGE, Type> { MapWireFieldTypeTraits<WireFormatLite::TYPE_MESSAGE, Type>::kIsEnum; // Functions used in parsing and serialization. =================== - static inline int ByteSize(const MapEntryAccessorType& value); + static inline size_t ByteSize(const MapEntryAccessorType& value); static inline int GetCachedSize(const MapEntryAccessorType& value); static inline bool Read(io::CodedInputStream* input, MapEntryAccessorType* value); @@ -276,7 +276,7 @@ MAP_HANDLER(BOOL) #undef MAP_HANDLER template <typename Type> -inline int +inline size_t MapTypeHandler<WireFormatLite::TYPE_MESSAGE, Type>::ByteSize( const MapEntryAccessorType& value) { return WireFormatLite::MessageSizeNoVirtual(value); |