Browse Source

Merge pull request #7851 from shlomif/fix-some-compilation-warnings

Get rid of some compilation warnings.
Rémi Verschelde 8 years ago
parent
commit
1ec8b9fb7d

+ 0 - 1
main/tests/test_string.cpp

@@ -835,7 +835,6 @@ bool test_28() {
 
 bool test_29() {
 
-	bool error = false;
 	bool state = true;
 	bool success = false;
 

+ 5 - 5
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();

+ 1 - 0
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: {

+ 1 - 1
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;
 }