godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Merge pull request #36461 from akien-mga/c++17-fallthrough-attribute

Browse Source 
Replace FALLTHROUGH macro by C++17 [[fallthrough]]
This commit is contained in:
Rémi Verschelde
2020-02-23 08:43:18 +01:00
committed by GitHub
parent 63b0d822d1 2cf6ac6c50
commit bd10c70458
25 changed files with 75 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/gdscript/gdscript_tokenizer.cpp
View File

@@ -343,7 +343,7 @@ StringName GDScriptTokenizer::get_token_literal(int p_offset) const {
default: {
}
}
}
} break;
case TK_OP_AND:
case TK_OP_OR:
break; // Don't get into default, since they can be non-literal
@@ -539,7 +539,7 @@ void GDScriptTokenizerText::_advance() {
ignore_warnings = true;
}
#endif // DEBUG_ENABLED
FALLTHROUGH;
[[fallthrough]];
}
case '\n': {
line++;
@@ -756,7 +756,7 @@ void GDScriptTokenizerText::_advance() {
}
INCPOS(1);
is_string_name = true;
FALLTHROUGH;
[[fallthrough]];
case '\'':
case '"': {