diff options
| author | Thomas Edvalson <machin3@gmail.com> | 2016-10-06 16:36:05 -0400 |
|---|---|---|
| committer | Thomas Edvalson <machin3@gmail.com> | 2016-10-06 16:51:19 -0400 |
| commit | 6debabe57eaff1bf59d04b84eb56ffdef2a2957f (patch) | |
| tree | 10fd2fef227b5173ccabba962a0e4d991b83e236 | |
| parent | 1f9e16119f2b17fa507bdee8529459ed91f27b8c (diff) | |
Use int instead of int32_t for Vectors
| -rw-r--r-- | bin/tests/test_math.cpp | 2 | ||||
| -rw-r--r-- | core/variant_parser.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/bin/tests/test_math.cpp b/bin/tests/test_math.cpp index e5667bff64..9329002f76 100644 --- a/bin/tests/test_math.cpp +++ b/bin/tests/test_math.cpp @@ -516,7 +516,7 @@ MainLoop* test() { { - Vector<int32_t> hashes; + Vector<int> hashes; List<StringName> tl; ObjectTypeDB::get_type_list(&tl); diff --git a/core/variant_parser.cpp b/core/variant_parser.cpp index 6b3828a572..5ed2415e36 100644 --- a/core/variant_parser.cpp +++ b/core/variant_parser.cpp @@ -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]); } |