Fix productIterator

The algorithms really enforce that the iterator must return a reference.
disorderedmaterials · Apr 23, 2024 · e4081ff · e4081ff
1 parent e5e0886
commit e4081ff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/classes/productIterator.cpp b/src/classes/productIterator.cpp
@@ -34,7 +34,10 @@ bool ProductIterator::operator==(const ProductIterator &other) const { return x_
 
 bool ProductIterator::operator!=(const ProductIterator &other) const { return x_ != other.x_ || y_ != other.y_; }
 
-ProductIterator::value_type ProductIterator::operator*() { return {x_, y_}; }
+ProductIterator::reference ProductIterator::operator*() {
+  internal_ = std::make_tuple<>(x_, y_);
+  return internal_;
+}
 
 ProductIterator &ProductIterator::operator++()
 {

diff --git a/src/classes/productIterator.h b/src/classes/productIterator.h
@@ -9,6 +9,7 @@ class ProductIterator
 {
     private:
     int x_, y_, xSize_, ySize_;
+    std::tuple<int, int> internal_;
     int toIndex() const;
     void fromIndex(int);
 
@@ -24,7 +25,7 @@ class ProductIterator
 
     ProductIterator begin() const;
     ProductIterator end() const;
-    value_type operator*();
+    reference operator*();
     value_type operator[](difference_type i) const;
 
     difference_type operator-(const ProductIterator &it) const;