diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-02-26 20:22:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-26 20:22:48 +0100 |
| commit | 1ec8b9fb7dfaa074b1f6c2017790f65ca24fa88c (patch) | |
| tree | 5d4425e514de01a7a140a3eba25b9aad7e16708b | |
| parent | ca805744fba0662397ecdcda4e552990a81adfcb (diff) | |
| parent | 0a2c387d5c375aa9dd9e828f100ab55deb8dac72 (diff) | |
| download | redot-engine-1ec8b9fb7dfaa074b1f6c2017790f65ca24fa88c.tar.gz | |
Merge pull request #7851 from shlomif/fix-some-compilation-warnings
Get rid of some compilation warnings.
| -rw-r--r-- | main/tests/test_string.cpp | 1 | ||||
| -rw-r--r-- | modules/dds/texture_loader_dds.cpp | 10 | ||||
| -rw-r--r-- | modules/gdscript/gd_editor.cpp | 1 | ||||
| -rw-r--r-- | platform/x11/os_x11.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/main/tests/test_string.cpp b/main/tests/test_string.cpp index a4a8ceb072..518c4503fc 100644 --- a/main/tests/test_string.cpp +++ b/main/tests/test_string.cpp @@ -835,7 +835,6 @@ bool test_28() { bool test_29() { - bool error = false; bool state = true; bool success = false; diff --git a/modules/dds/texture_loader_dds.cpp b/modules/dds/texture_loader_dds.cpp index 5295183c35..600cae991e 100644 --- a/modules/dds/texture_loader_dds.cpp +++ b/modules/dds/texture_loader_dds.cpp @@ -114,7 +114,7 @@ RES ResourceFormatDDS::load(const String &p_path, const String& p_original_path, uint32_t width = f->get_32(); uint32_t height = f->get_32(); uint32_t pitch = f->get_32(); - uint32_t depth = f->get_32(); + /* uint32_t depth = */ f->get_32(); uint32_t mipmaps = f->get_32(); //skip 11 @@ -130,7 +130,7 @@ RES ResourceFormatDDS::load(const String &p_path, const String& p_original_path, } - uint32_t format_size = f->get_32(); + /* uint32_t format_size = */ f->get_32(); uint32_t format_flags = f->get_32(); uint32_t format_fourcc = f->get_32(); uint32_t format_rgb_bits = f->get_32(); @@ -139,9 +139,9 @@ RES ResourceFormatDDS::load(const String &p_path, const String& p_original_path, uint32_t format_blue_mask = f->get_32(); uint32_t format_alpha_mask = f->get_32(); - uint32_t caps_1 = f->get_32(); - uint32_t caps_2 = f->get_32(); - uint32_t caps_ddsx = f->get_32(); + /* uint32_t caps_1 = */ f->get_32(); + /* uint32_t caps_2 = */ f->get_32(); + /* uint32_t caps_ddsx = */ f->get_32(); //reserved skip f->get_32(); diff --git a/modules/gdscript/gd_editor.cpp b/modules/gdscript/gd_editor.cpp index f325aec072..352016b2d2 100644 --- a/modules/gdscript/gd_editor.cpp +++ b/modules/gdscript/gd_editor.cpp @@ -2645,6 +2645,7 @@ Error GDScriptLanguage::lookup_code(const String& p_code, const String& p_symbol switch(p.get_completion_type()) { + case GDParser::COMPLETION_GET_NODE: case GDParser::COMPLETION_NONE: { } break; case GDParser::COMPLETION_BUILT_IN_TYPE_CONSTANT: { diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 27df280927..a4ed08f330 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -1241,7 +1241,7 @@ static Property read_property(Display* p_display, Window p_window, Atom p_proper }while(bytes_after != 0); - Property p = {ret, actual_format, nitems, actual_type}; + Property p = {ret, actual_format, (int)nitems, actual_type}; return p; } |