Changeset f22b170b for src/Common/Iterate.hpp

Timestamp:

Nov 16, 2023, 9:22:34 AM (7 months ago)

Author:

caparson <caparson@…>

Branches:

master

Children:

aad677d

Parents:

89a8bab (diff), b8b5535 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/Common/Iterate.hpp (modified) (2 diffs)

src/Common/Iterate.hpp

@@ -58 +58 @@
         template<typename val_t>
         struct value_t {
+                size_t idx;
                 val_t & val;
-                size_t idx;
         };
 
@@ -69 +69 @@
                 iterator_t( iter_t _it, size_t _idx ) : it(_it), idx(_idx) {}
 
-                value_t<val_t> operator*() const { return value_t<val_t>{ *it, idx }; }
+                value_t<val_t> operator*() const { return value_t<val_t>{ idx, *it }; }
 
                 bool operator==(const iterator_t & o) const { return o.it == it; }