diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-10-17 09:53:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-17 09:53:06 +0200 |
| commit | c7ea84241644e0ccb83e3ef9e36eff5cef509fc0 (patch) | |
| tree | fcc7640f2081a6d2d2e02fff4cbe96cdf1a14fd4 /core/variant_parser.cpp | |
| parent | 0eccf42884d4a595ac659355190dc1bb0a932c7a (diff) | |
| parent | 6debabe57eaff1bf59d04b84eb56ffdef2a2957f (diff) | |
Merge pull request #6733 from Cruel/patch-1
Use int consistently instead of int32_t for Vectors
Diffstat (limited to 'core/variant_parser.cpp')
| -rw-r--r-- | core/variant_parser.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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]); } |