Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #67027 from akien-mga/msvc-–fix-c4702

Browse source 
Fix more MSVC C4702 (unreachable code) warnings
This commit is contained in:
Rémi Verschelde 2022-10-07 16:09:53 +02:00
commit 0384abe9ca
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/variant/variant.cpp
View file

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

12
modules/gdscript/tests/gdscript_test_runner.cpp
View file

@ -479,9 +479,9 @@ GDScriptTest::TestResult GDScriptTest::execute_test_code(bool p_is_generating) {
result.output = get_text_for_status(result.status) + "\n";
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) {
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";
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) {
result.passed = check_output(result.output);