Quellcode durchsuchen

Fix more MSVC C4702 (unreachable code) warnings

Rémi Verschelde vor 2 Jahren
Ursprung
Commit
62b066dbd6
2 geänderte Dateien mit 6 neuen und 8 gelöschten Zeilen
  1. 0 2
      core/variant/variant.cpp
  2. 6 6
      modules/gdscript/tests/gdscript_test_runner.cpp

+ 0 - 2
core/variant/variant.cpp

@@ -1929,8 +1929,6 @@ String Variant::stringify(int recursion_count) const {
 			return "<" + get_type_name(type) + ">";
 			return "<" + get_type_name(type) + ">";
 		}
 		}
 	}
 	}
-
-	return "";
 }
 }
 
 
 String Variant::to_json_string() const {
 String Variant::to_json_string() const {

+ 6 - 6
modules/gdscript/tests/gdscript_test_runner.cpp

@@ -479,9 +479,9 @@ GDScriptTest::TestResult GDScriptTest::execute_test_code(bool p_is_generating) {
 		result.output = get_text_for_status(result.status) + "\n";
 		result.output = get_text_for_status(result.status) + "\n";
 
 
 		const List<GDScriptParser::ParserError> &errors = parser.get_errors();
 		const List<GDScriptParser::ParserError> &errors = parser.get_errors();
-		for (const GDScriptParser::ParserError &E : errors) {
-			result.output += E.message + "\n"; // TODO: line, column?
-			break; // Only the first error since the following might be cascading.
+		if (!errors.is_empty()) {
+			// Only the first error since the following might be cascading.
+			result.output += errors[0].message + "\n"; // TODO: line, column?
 		}
 		}
 		if (!p_is_generating) {
 		if (!p_is_generating) {
 			result.passed = check_output(result.output);
 			result.passed = check_output(result.output);
@@ -498,9 +498,9 @@ GDScriptTest::TestResult GDScriptTest::execute_test_code(bool p_is_generating) {
 		result.output = get_text_for_status(result.status) + "\n";
 		result.output = get_text_for_status(result.status) + "\n";
 
 
 		const List<GDScriptParser::ParserError> &errors = parser.get_errors();
 		const List<GDScriptParser::ParserError> &errors = parser.get_errors();
-		for (const GDScriptParser::ParserError &E : errors) {
-			result.output += E.message + "\n"; // TODO: line, column?
-			break; // Only the first error since the following might be cascading.
+		if (!errors.is_empty()) {
+			// Only the first error since the following might be cascading.
+			result.output += errors[0].message + "\n"; // TODO: line, column?
 		}
 		}
 		if (!p_is_generating) {
 		if (!p_is_generating) {
 			result.passed = check_output(result.output);
 			result.passed = check_output(result.output);