diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-02-27 09:22:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-27 09:22:47 +0100 |
| commit | 426a6fdc17227715d397f8c09849ce0673b37e64 (patch) | |
| tree | 9661566abc64fb26d2f0aeeec1d8fd35d39660f3 /core/io | |
| parent | 0ba75c195efffcb098ac74440ffb0fa9c85d0d96 (diff) | |
| parent | e5f665c7187b6934a71169cab5075f899150f17a (diff) | |
Merge pull request #26134 from marxin/fix-Wsign-compare
Fix -Wsign-compare warnings.
Diffstat (limited to 'core/io')
| -rw-r--r-- | core/io/packet_peer.cpp | 2 | ||||
| -rw-r--r-- | core/io/resource_format_binary.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/io/packet_peer.cpp b/core/io/packet_peer.cpp index 3aa1fcfd8f..d7bfdbbb37 100644 --- a/core/io/packet_peer.cpp +++ b/core/io/packet_peer.cpp @@ -224,7 +224,7 @@ Error PacketPeerStream::get_packet(const uint8_t **r_buffer, int &r_buffer_size) uint32_t len = decode_uint32(lbuf); ERR_FAIL_COND_V(remaining < (int)len, ERR_UNAVAILABLE); - ERR_FAIL_COND_V(input_buffer.size() < len, ERR_UNAVAILABLE); + ERR_FAIL_COND_V(input_buffer.size() < (int)len, ERR_UNAVAILABLE); ring_buffer.read(lbuf, 4); //get rid of first 4 bytes ring_buffer.read(input_buffer.ptrw(), len); // read packet diff --git a/core/io/resource_format_binary.cpp b/core/io/resource_format_binary.cpp index 6c48942d72..42070cd132 100644 --- a/core/io/resource_format_binary.cpp +++ b/core/io/resource_format_binary.cpp @@ -106,7 +106,7 @@ StringName ResourceInteractiveLoaderBinary::_get_string() { uint32_t id = f->get_32(); if (id & 0x80000000) { uint32_t len = id & 0x7FFFFFFF; - if (len > str_buf.size()) { + if ((int)len > str_buf.size()) { str_buf.resize(len); } if (len == 0) |