diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-08-06 12:55:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-06 12:55:40 +0200 |
| commit | b3c2281706778cf5311a68fe0071aa2740d01131 (patch) | |
| tree | 28e546afd0916a6f6dbab2360e1f335d93e853a1 /modules | |
| parent | 9f4e9ad75cfecdefd8d8158d59e3dd976df373b2 (diff) | |
| parent | c44ebb020d633e0e375a2d6d6ca6c1ba09e79111 (diff) | |
Merge pull request #50487 from akien-mga/clang-warning-Wordered-compare-function-pointers
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/freetype/SCsub | 1 | ||||
| -rw-r--r-- | modules/websocket/emws_peer.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/modules/freetype/SCsub b/modules/freetype/SCsub index fc2535a6ca..476cb9cf2a 100644 --- a/modules/freetype/SCsub +++ b/modules/freetype/SCsub @@ -80,6 +80,7 @@ if env["builtin_freetype"]: # Forcibly undefine this macro so SIMD is not used in this file, # since currently unsupported in WASM tmp_env = env_freetype.Clone() + tmp_env.disable_warnings() tmp_env.Append(CPPFLAGS=["-U__OPTIMIZE__"]) sfnt = tmp_env.Object(sfnt) thirdparty_sources += [sfnt] diff --git a/modules/websocket/emws_peer.cpp b/modules/websocket/emws_peer.cpp index 69822f6ff3..d7263dcf43 100644 --- a/modules/websocket/emws_peer.cpp +++ b/modules/websocket/emws_peer.cpp @@ -54,7 +54,7 @@ Error EMWSPeer::read_msg(const uint8_t *p_data, uint32_t p_size, bool p_is_strin } Error EMWSPeer::put_packet(const uint8_t *p_buffer, int p_buffer_size) { - ERR_FAIL_COND_V(_out_buf_size && (godot_js_websocket_buffered_amount(peer_sock) >= (1ULL << _out_buf_size)), ERR_OUT_OF_MEMORY); + ERR_FAIL_COND_V(_out_buf_size && ((uint64_t)godot_js_websocket_buffered_amount(peer_sock) >= (1ULL << _out_buf_size)), ERR_OUT_OF_MEMORY); int is_bin = write_mode == WebSocketPeer::WRITE_MODE_BINARY ? 1 : 0; |