diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-09-10 12:21:02 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-10 12:21:02 -0300 |
| commit | fc61eb37ce004ecfa0656a46c68d111c68bb5c19 (patch) | |
| tree | 0aa31fc3891596abca39042f27404f329e002b2d /modules | |
| parent | 026c7913cf6f38b948d66484d97d7841fa1c9f16 (diff) | |
| parent | a4674bda47ddeed7cc929bafdcd89b6bd156ee30 (diff) | |
Merge pull request #5920 from 29jm/fix-warnings
Fix some more warnings
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gdscript/gd_editor.cpp | 2 | ||||
| -rw-r--r-- | modules/gdscript/gd_tokenizer.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/gdscript/gd_editor.cpp b/modules/gdscript/gd_editor.cpp index 2a80531ec5..d02e2b92e4 100644 --- a/modules/gdscript/gd_editor.cpp +++ b/modules/gdscript/gd_editor.cpp @@ -2094,7 +2094,7 @@ Error GDScriptLanguage::complete_code(const String& p_code, const String& p_base GDParser p; - Error err = p.parse(p_code,p_base_path,false,"",true); + p.parse(p_code,p_base_path,false,"",true); bool isfunction=false; Set<String> options; diff --git a/modules/gdscript/gd_tokenizer.cpp b/modules/gdscript/gd_tokenizer.cpp index 072a7e26a0..2041ec12ad 100644 --- a/modules/gdscript/gd_tokenizer.cpp +++ b/modules/gdscript/gd_tokenizer.cpp @@ -1332,7 +1332,7 @@ StringName GDTokenizerBuffer::get_token_identifier(int p_offset) const{ ERR_FAIL_INDEX_V(offset,tokens.size(),StringName()); uint32_t identifier = tokens[offset]>>TOKEN_BITS; - ERR_FAIL_INDEX_V(identifier,identifiers.size(),StringName()); + ERR_FAIL_INDEX_V(identifier,(uint32_t)identifiers.size(),StringName()); return identifiers[identifier]; } @@ -1391,7 +1391,7 @@ const Variant& GDTokenizerBuffer::get_token_constant(int p_offset) const{ int offset = token+p_offset; ERR_FAIL_INDEX_V(offset,tokens.size(),nil); uint32_t constant = tokens[offset]>>TOKEN_BITS; - ERR_FAIL_INDEX_V(constant,constants.size(),nil); + ERR_FAIL_INDEX_V(constant,(uint32_t)constants.size(),nil); return constants[constant]; } |