Merge pull request #1162 from corona10/bitset_begin

bitset begin() function fix

Merge pull request #1162 from corona10/bitset_begin
bitset begin() function fix
cb0fd07e · Kevin Modzelewski · 3ed04ee9 · 4bdc3989 · cb0fd07e
Commit cb0fd07e authored May 08, 2016 by Kevin Modzelewski
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

src/core/util.h src/core/util.h +4 -3

No files found.
--- a/src/core/util.h
+++ b/src/core/util.h
@@ -181,9 +181,10 @@ template <int N> struct BitSet {
    }
    iterator begin() const {
        uint16_t tmp = bits;
-        for (int i = 0; i < N; i++) {
+        if (tmp > 0) {
-            if (tmp & 1)
+            int offset = __builtin_ctz(tmp);
-                return iterator(*this, i);
+            if (offset < N)
+                return iterator(*this, offset);
        }
        return iterator(*this, N);
    }