diff options
author | Max Hilbrunner <mhilbrunner@users.noreply.github.com> | 2021-08-28 21:18:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-28 21:18:39 +0200 |
commit | 04c64b59a12a0ea9a2dfa153c630693c7391827d (patch) | |
tree | 4aea8a02ee8d3ab0533a2b390b41f76e2354d648 | |
parent | 5d2c4faa89fcd5f05c51c5ab791ced3f9ae91587 (diff) | |
parent | c2d1c1c3ee0ef9175ac70271205723061331a242 (diff) |
Merge pull request #47406 from mashumafi/master-Array-insert-rc
Array::insert consistent with Pool*Array::insert
-rw-r--r-- | core/variant/array.cpp | 6 | ||||
-rw-r--r-- | core/variant/array.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/variant/array.cpp b/core/variant/array.cpp index 78ad796283..8373cbd4e8 100644 --- a/core/variant/array.cpp +++ b/core/variant/array.cpp @@ -203,9 +203,9 @@ Error Array::resize(int p_new_size) { return _p->array.resize(p_new_size); } -void Array::insert(int p_pos, const Variant &p_value) { - ERR_FAIL_COND(!_p->typed.validate(p_value, "insert")); - _p->array.insert(p_pos, p_value); +Error Array::insert(int p_pos, const Variant &p_value) { + ERR_FAIL_COND_V(!_p->typed.validate(p_value, "insert"), ERR_INVALID_PARAMETER); + return _p->array.insert(p_pos, p_value); } void Array::fill(const Variant &p_value) { diff --git a/core/variant/array.h b/core/variant/array.h index e9634ccece..4a1b25c4a9 100644 --- a/core/variant/array.h +++ b/core/variant/array.h @@ -72,7 +72,7 @@ public: void append_array(const Array &p_array); Error resize(int p_new_size); - void insert(int p_pos, const Variant &p_value); + Error insert(int p_pos, const Variant &p_value); void remove(int p_pos); void fill(const Variant &p_value); |