diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-02-20 22:24:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-20 22:24:58 +0100 |
| commit | 8107fc98b6ceae749b3c10e6f0432e904961867b (patch) | |
| tree | 6c0ab829b02aba47ff3dc27b9a14d3c3a0658a3b /modules/gdscript/gdscript_tokenizer.cpp | |
| parent | 132e2f458df7a3551a251d68afeccd0362ca6be2 (diff) | |
| parent | 8d51618949d5ea8a94e0f504401e8f852a393968 (diff) | |
Merge pull request #25853 from marxin/fix-25316-wshadow-local
Add -Wshadow=local to warnings and fix reported issues (#25316).
Diffstat (limited to 'modules/gdscript/gdscript_tokenizer.cpp')
| -rw-r--r-- | modules/gdscript/gdscript_tokenizer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/gdscript/gdscript_tokenizer.cpp b/modules/gdscript/gdscript_tokenizer.cpp index 0f2f0bbb26..dc9f2db331 100644 --- a/modules/gdscript/gdscript_tokenizer.cpp +++ b/modules/gdscript/gdscript_tokenizer.cpp @@ -989,11 +989,11 @@ void GDScriptTokenizerText::_advance() { //built in func? - for (int i = 0; i < GDScriptFunctions::FUNC_MAX; i++) { + for (int j = 0; j < GDScriptFunctions::FUNC_MAX; j++) { - if (str == GDScriptFunctions::get_func_name(GDScriptFunctions::Function(i))) { + if (str == GDScriptFunctions::get_func_name(GDScriptFunctions::Function(j))) { - _make_built_in_func(GDScriptFunctions::Function(i)); + _make_built_in_func(GDScriptFunctions::Function(j)); found = true; break; } |