diff options
| author | Feng Xiao <xiaofeng@google.com> | 2016-01-19 16:57:10 -0800 |
|---|---|---|
| committer | Feng Xiao <xiaofeng@google.com> | 2016-01-19 16:57:10 -0800 |
| commit | 6794d17c948f1b36d8e77a91568a40456ec8ada3 (patch) | |
| tree | e4bf184125f3edae9f4467b28f342bd46a54833b | |
| parent | 91427fe0751936cf9e4db925b2c47dd7a5c09d58 (diff) | |
| parent | 3937dedbff63965b1e7ad08b77503a3971d2ff2b (diff) | |
| download | protobuf-6794d17c948f1b36d8e77a91568a40456ec8ada3.tar.gz protobuf-6794d17c948f1b36d8e77a91568a40456ec8ada3.tar.bz2 protobuf-6794d17c948f1b36d8e77a91568a40456ec8ada3.zip | |
Merge pull request #1155 from jcburke14/jb-intcast
Fix compiler warning from repeated_field.h
| -rw-r--r-- | src/google/protobuf/repeated_field.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/repeated_field.h b/src/google/protobuf/repeated_field.h index 432236ce..61f3f558 100644 --- a/src/google/protobuf/repeated_field.h +++ b/src/google/protobuf/repeated_field.h @@ -692,7 +692,7 @@ class LIBPROTOBUF_EXPORT StringTypeHandlerBase { class StringTypeHandler : public StringTypeHandlerBase { public: static int SpaceUsed(const string& value) { - return sizeof(value) + StringSpaceUsedExcludingSelf(value); + return static_cast<int>(sizeof(value)) + StringSpaceUsedExcludingSelf(value); } }; |