From 4d546164e749871c96b77f6c894a47302827b796 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Mon, 17 Dec 2018 12:42:24 +0100 Subject: [PATCH] Fix maybe-uninitialized warnings from GCC 4.8.x Fixes the following warnings in `p=server target=release_debug` builds on Travis CI: ``` ./core/os/memory.h: In function 'MainLoop* TestOAHashMap::test()': ./core/os/memory.h:108:111: warning: 'dummy' may be used uninitialized in this function [-Wmaybe-uninitialized] #define memnew_placement(m_placement, m_class) _post_initialize(new (m_placement, sizeof(m_class), "") m_class) ^ main/tests/test_oa_hash_map.cpp:98:7: note: 'dummy' was declared here int dummy; ^ scene/resources/bit_mask.cpp:447:3: warning: 'next_i' may be used uninitialized in this function [-Wmaybe-uninitialized] scene/resources/bit_mask.cpp:448:4: warning: 'next_j' may be used uninitialized in this function [-Wmaybe-uninitialized] ``` --- main/tests/test_oa_hash_map.cpp | 2 +- scene/resources/bit_mask.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/main/tests/test_oa_hash_map.cpp b/main/tests/test_oa_hash_map.cpp index deaba285cf6..984a661aaab 100644 --- a/main/tests/test_oa_hash_map.cpp +++ b/main/tests/test_oa_hash_map.cpp @@ -95,7 +95,7 @@ MainLoop *test() { // stress test / test for issue #22928 { OAHashMap map; - int dummy; + int dummy = 0; const int N = 1000; uint32_t *keys = new uint32_t[N]; diff --git a/scene/resources/bit_mask.cpp b/scene/resources/bit_mask.cpp index 56b236d03bb..587ab73dce0 100644 --- a/scene/resources/bit_mask.cpp +++ b/scene/resources/bit_mask.cpp @@ -432,8 +432,8 @@ static void fill_bits(const BitMap *p_src, Ref &p_map, const Point2i &p_ int stack_size = 0; Point2i pos = p_pos; - int next_i; - int next_j; + int next_i = 0; + int next_j = 0; bool reenter = true; bool popped = false;