|
|
@@ -243,12 +243,16 @@ namespace Framework
|
|
|
|
|
|
bool operator!=(ArrayIterator<TYP>& r)
|
|
|
{
|
|
|
- return current != r.current;
|
|
|
+ return current != r.current
|
|
|
+ || ((!current || !current->set)
|
|
|
+ != (!r.current || !r.current->set));
|
|
|
}
|
|
|
|
|
|
bool operator==(ArrayIterator<TYP>& r)
|
|
|
{
|
|
|
- return current == r.current;
|
|
|
+ return current == r.current
|
|
|
+ || ((!current || !current->set)
|
|
|
+ && (!r.current || !r.current->set));
|
|
|
}
|
|
|
|
|
|
void remove() override
|