Merge pull request #90631 from AThousandShips/array_iter_fix

[Core] Fix incorrect comparison for `Array` const iterator
godotengine · Apr 13, 2024 · 578d937 · 578d937
2 parents 43b32f9 + 80cb914
commit 578d937
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/core/variant/array.h b/core/variant/array.h
@@ -54,7 +54,7 @@ class Array {
 		_FORCE_INLINE_ ConstIterator &operator--();
 
 		_FORCE_INLINE_ bool operator==(const ConstIterator &p_other) const { return element_ptr == p_other.element_ptr; }
-		_FORCE_INLINE_ bool operator!=(const ConstIterator &p_other) const { return element_ptr == p_other.element_ptr; }
+		_FORCE_INLINE_ bool operator!=(const ConstIterator &p_other) const { return element_ptr != p_other.element_ptr; }
 
 		_FORCE_INLINE_ ConstIterator(const Variant *p_element_ptr, Variant *p_read_only = nullptr) :
 				element_ptr(p_element_ptr), read_only(p_read_only) {}

diff --git a/tests/core/variant/test_array.h b/tests/core/variant/test_array.h
@@ -555,13 +555,17 @@ TEST_CASE("[Array] Iteration") {
 		idx++;
 	}
 
+	CHECK_EQ(idx, a1.size());
+
 	idx = 0;
 
 	for (const Variant &E : (const Array &)a1) {
 		CHECK_EQ(int(a2[idx]), int(E));
 		idx++;
 	}
 
+	CHECK_EQ(idx, a1.size());
+
 	a1.clear();
 }