diff options
| author |  Adam Cozzette <acozzette@gmail.com> | 2018-06-22 10:01:12 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-06-22 10:01:12 -0700 |
| commit | f42d5923f0b6de75611af0a8c8b3354763aece00 (patch) | |
| tree | 4780050965405079c461b913a3cb9ee51862caf3 | |
| parent | 6a4fec616ec4b20f54d5fb530808b855cb664390 (diff) | |
| parent | 496822d307ff234180f0e88a4a9046f67e370710 (diff) | |
Merge pull request #4815 from vervaekejonathan/master
Fix parameters declaration
| -rw-r--r-- | src/google/protobuf/generated_message_util.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/generated_message_util.h b/src/google/protobuf/generated_message_util.h index c26e3e52..bdaa561b 100644 --- a/src/google/protobuf/generated_message_util.h +++ b/src/google/protobuf/generated_message_util.h @@ -201,7 +201,7 @@ struct SerializationTable { }; LIBPROTOBUF_EXPORT void SerializeInternal(const uint8* base, const FieldMetadata* table, - int num_fields, ::google::protobuf::io::CodedOutputStream* output); + int32 num_fields, ::google::protobuf::io::CodedOutputStream* output); inline void TableSerialize(const ::google::protobuf::MessageLite& msg, const SerializationTable* table, @@ -219,7 +219,7 @@ inline void TableSerialize(const ::google::protobuf::MessageLite& msg, } uint8* SerializeInternalToArray(const uint8* base, const FieldMetadata* table, - int num_fields, bool is_deterministic, + int32 num_fields, bool is_deterministic, uint8* buffer); inline uint8* TableSerializeToArray(const ::google::protobuf::MessageLite& msg, |