diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-01-11 08:53:31 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-01-11 08:54:17 -0300 |
| commit | e6583117df95373cffb12105de82d3816ca09f85 (patch) | |
| tree | 9953c32a4b50db9cc99d0999c7904a27748a0ace /core/variant_op.cpp | |
| parent | 57166cd2923cc6d32b37c34f6ca2f32f6941e4a8 (diff) | |
| download | redot-engine-e6583117df95373cffb12105de82d3816ca09f85.tar.gz | |
Both Array and Dictionary are always in shared mode (removed copy on write).
Diffstat (limited to 'core/variant_op.cpp')
| -rw-r--r-- | core/variant_op.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/variant_op.cpp b/core/variant_op.cpp index 1e67d81ae2..281d2e8192 100644 --- a/core/variant_op.cpp +++ b/core/variant_op.cpp @@ -507,7 +507,7 @@ void Variant::evaluate(const Operator& p_op, const Variant& p_a, const Variant& } const Array &array_a=*reinterpret_cast<const Array *>(p_a._data._mem); const Array &array_b=*reinterpret_cast<const Array *>(p_b._data._mem); - Array sum(array_a.is_shared() || array_b.is_shared()); + Array sum; int asize=array_a.size(); int bsize=array_b.size(); sum.resize(asize+bsize); @@ -2949,7 +2949,7 @@ bool Variant::iter_init(Variant& r_iter,bool &valid) const { #endif Variant::CallError ce; ce.error=Variant::CallError::CALL_OK; - Array ref(true); + Array ref; ref.push_back(r_iter); Variant vref=ref; const Variant *refp[]={&vref}; @@ -3075,7 +3075,7 @@ bool Variant::iter_next(Variant& r_iter,bool &valid) const { #endif Variant::CallError ce; ce.error=Variant::CallError::CALL_OK; - Array ref(true); + Array ref; ref.push_back(r_iter); Variant vref=ref; const Variant *refp[]={&vref}; |