summaryrefslogtreecommitdiffstats
path: root/modules/gdscript/gdscript_tokenizer.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-02-23 08:43:18 +0100
committerGitHub <noreply@github.com>2020-02-23 08:43:18 +0100
commitbd10c7045865bc7788f695b3ecc4fb136a499d87 (patch)
tree17b378d5698fe51bcd2e67aa648e704b29427b88 /modules/gdscript/gdscript_tokenizer.cpp
parent63b0d822d109f3612d5c22e4342ebef9cd3b9163 (diff)
parent2cf6ac6c507529884d6b8acfdc42f3bc1826b19d (diff)
downloadredot-engine-bd10c7045865bc7788f695b3ecc4fb136a499d87.tar.gz
Merge pull request #36461 from akien-mga/c++17-fallthrough-attribute
Replace FALLTHROUGH macro by C++17 [[fallthrough]]
Diffstat (limited to 'modules/gdscript/gdscript_tokenizer.cpp')
-rw-r--r--modules/gdscript/gdscript_tokenizer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/gdscript/gdscript_tokenizer.cpp b/modules/gdscript/gdscript_tokenizer.cpp
index adcdbdc4a4..818033025e 100644
--- a/modules/gdscript/gdscript_tokenizer.cpp
+++ b/modules/gdscript/gdscript_tokenizer.cpp
@@ -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 '"': {