diff options
| author | Adam Cozzette <acozzette@gmail.com> | 2016-11-09 13:07:24 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-09 13:07:24 -0800 |
| commit | ce5160b83b03c29fd27fc9f58370092b321bf2bc (patch) | |
| tree | a0290e17446eb737b8ca3df8d70ea319c8eb6777 | |
| parent | d584321fb4a9b4deb4a7d054cf4f3eaa2f4a009f (diff) | |
| parent | 975d577a2b3b4d5a76e97bf93bb614bb4e3a52bb (diff) | |
| download | protobuf-ce5160b83b03c29fd27fc9f58370092b321bf2bc.tar.gz protobuf-ce5160b83b03c29fd27fc9f58370092b321bf2bc.tar.bz2 protobuf-ce5160b83b03c29fd27fc9f58370092b321bf2bc.zip | |
Merge pull request #2332 from Kwizatz/master
Added explicit cast to avoid size warning on Win64.
| -rw-r--r-- | src/google/protobuf/message_lite.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/message_lite.h b/src/google/protobuf/message_lite.h index d3c3b1f0..88455669 100644 --- 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 |