Merge pull request #2332 from Kwizatz/master

Added explicit cast to avoid size warning on Win64.
9 years ago · ce5160b83b
parent d584321fb4 975d577a2b
commit ce5160b83b
1 changed files with 1 additions and 1 deletions
--- a/src/google/protobuf/message_lite.h
+++ b/src/google/protobuf/message_lite.h
@ -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