diff --git a/core/templates/vector.h b/core/templates/vector.h index f30747d238..64f82aa42c 100644 --- a/core/templates/vector.h +++ b/core/templates/vector.h @@ -315,8 +315,8 @@ public: template void Vector::reverse() { + T *p = ptrw(); for (Size i = 0; i < size() / 2; i++) { - T *p = ptrw(); SWAP(p[i], p[size() - i - 1]); } } @@ -329,8 +329,9 @@ void Vector::append_array(Vector p_other) { } const Size bs = size(); resize(bs + ds); + T *p = ptrw(); for (Size i = 0; i < ds; ++i) { - ptrw()[bs + i] = p_other[i]; + p[bs + i] = p_other[i]; } } diff --git a/core/variant/array.cpp b/core/variant/array.cpp index 8b6487eed9..da90c8b38b 100644 --- a/core/variant/array.cpp +++ b/core/variant/array.cpp @@ -738,7 +738,7 @@ int Array::bsearch(const Variant &p_value, bool p_before) const { Variant value = p_value; ERR_FAIL_COND_V(!_p->typed.validate(value, "binary search"), -1); SearchArray avs; - return avs.bisect(_p->array.ptrw(), _p->array.size(), value, p_before); + return avs.bisect(_p->array.ptr(), _p->array.size(), value, p_before); } int Array::bsearch_custom(const Variant &p_value, const Callable &p_callable, bool p_before) const {