asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6733 from Cruel/patch-1

Browse source 
Use int consistently instead of int32_t for Vectors
This commit is contained in:
Rémi Verschelde 2016-10-17 09:53:06 +02:00 committed by GitHub
commit c7ea842416
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/tests/test_math.cpp
View file

@ -516,7 +516,7 @@ MainLoop* test() {
{
Vector<int32_t> hashes;
Vector<int> hashes;
List<StringName> tl;
ObjectTypeDB::get_type_list(&tl);

8
core/variant_parser.cpp
View file

@ -1177,16 +1177,16 @@ Error VariantParser::parse_value(Token& token,Variant &value,Stream *p_stream,in
} else if (id=="IntArray") {
Vector<int32_t> args;
Error err = _parse_construct<int32_t>(p_stream,args,line,r_err_str);
Vector<int> args;
Error err = _parse_construct<int>(p_stream,args,line,r_err_str);
if (err)
return err;
DVector<int32_t> arr;
DVector<int> arr;
{
int len=args.size();
arr.resize(len);
DVector<int32_t>::Write w = arr.write();
DVector<int>::Write w = arr.write();
for(int i=0;i<len;i++) {
w[i]=int(args[i]);
}