organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Fix some narrowing implicit casts [NFC]

Browse source
This commit is contained in:
Kal Conley 2015-11-28 11:49:51 -08:00
parent d3cb5f4078
commit a52539a32d
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/google/protobuf/io/coded_stream.h
View file

@ -1035,7 +1035,7 @@ inline const uint8* CodedInputStream::ExpectTagFromArray(
inline void CodedInputStream::GetDirectBufferPointerInline(const void** data,
int* size) {
*data = buffer_;
*size = buffer_end_ - buffer_;
*size = static_cast<int>(buffer_end_ - buffer_);
}
inline bool CodedInputStream::ExpectAtEnd() {
@ -1231,7 +1231,7 @@ inline MessageFactory* CodedInputStream::GetExtensionFactory() {
}
inline int CodedInputStream::BufferSize() const {
return buffer_end_ - buffer_;
return static_cast<int>(buffer_end_ - buffer_);
}
inline CodedInputStream::CodedInputStream(ZeroCopyInputStream* input)

10
src/google/protobuf/wire_format_lite_inl.h
View file

@ -835,12 +835,14 @@ inline int WireFormatLite::EnumSize(int value) {
}
inline int WireFormatLite::StringSize(const string& value) {
return io::CodedOutputStream::VarintSize32(value.size()) +
value.size();
return static_cast<int>(
io::CodedOutputStream::VarintSize32(static_cast<uint32>(value.size())) +
value.size());
}
inline int WireFormatLite::BytesSize(const string& value) {
return io::CodedOutputStream::VarintSize32(value.size()) +
value.size();
return static_cast<int>(
io::CodedOutputStream::VarintSize32(static_cast<uint32>(value.size())) +
value.size());
}