noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #5920 from 29jm/fix-warnings

Browse Source 
Fix some more warnings
This commit is contained in:
Juan Linietsky
2016-09-10 12:21:02 -03:00
committed by GitHub
parent 026c7913cf a4674bda47
commit fc61eb37ce
25 changed files with 60 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gdscript/gd_editor.cpp
View File

@@ -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;

4
modules/gdscript/gd_tokenizer.cpp
View File

@@ -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];
}