Merge pull request #2332 from Kwizatz/master

Added explicit cast to avoid size warning on Win64.
This commit is contained in:
Adam Cozzette 2016-11-09 13:07:24 -08:00 committed by GitHub
commit ce5160b83b

View File

@ -244,7 +244,7 @@ class LIBPROTOBUF_EXPORT MessageLite {
//
// ByteSize() is generally linear in the number of fields defined for the
// proto.
virtual int ByteSize() const { return ByteSizeLong(); }
virtual int ByteSize() const { return static_cast<int>(ByteSizeLong()); }
virtual size_t ByteSizeLong() const;
// Serializes the message without recomputing the size. The message must