diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2016-03-30 11:43:44 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2016-03-30 11:43:44 -0700 |
| commit | 0de06f54bc8253ba39eee9e8cc4c5de487a48835 (patch) | |
| tree | e66dec08e23df554f5c29a1dbb4592388815e4ec /src/google/protobuf/io | |
| parent | 3b3c8abb9635eb3ea078a821a99c9ef29d66dff7 (diff) | |
| parent | a25e9964b126a79e8a99bced2207ddca22d6a1a9 (diff) | |
| download | protobuf-0de06f54bc8253ba39eee9e8cc4c5de487a48835.tar.gz protobuf-0de06f54bc8253ba39eee9e8cc4c5de487a48835.tar.bz2 protobuf-0de06f54bc8253ba39eee9e8cc4c5de487a48835.zip | |
Merge branch 'master' of github.com:google/protobuf
Diffstat (limited to 'src/google/protobuf/io')
| -rw-r--r-- | src/google/protobuf/io/coded_stream.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/io/coded_stream.h b/src/google/protobuf/io/coded_stream.h index e3771003..c81a33ac 100644 --- a/src/google/protobuf/io/coded_stream.h +++ b/src/google/protobuf/io/coded_stream.h @@ -1136,7 +1136,7 @@ inline void CodedOutputStream::WriteVarint32(uint32 value) { // this write won't cross the end, so we can skip the checks. uint8* target = buffer_; uint8* end = WriteVarint32ToArray(value, target); - int size = end - target; + int size = static_cast<int>(end - target); Advance(size); } else { WriteVarint32SlowPath(value); |