From fd17553f1a2cd80b8f928d09590b1b52c25b31dc Mon Sep 17 00:00:00 2001
From: Michael Richters <gedankenexperimenter@gmail.com>
Date: Thu, 24 Feb 2022 10:08:17 -0600
Subject: [PATCH] Rearrange iterator code in KeyAddrBitfield to simplify
 declarations

Signed-off-by: Michael Richters <gedankenexperimenter@gmail.com>
---
 src/kaleidoscope/KeyAddrBitfield.h | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/kaleidoscope/KeyAddrBitfield.h b/src/kaleidoscope/KeyAddrBitfield.h
index 8d612a66..2a74cf54 100644
--- a/src/kaleidoscope/KeyAddrBitfield.h
+++ b/src/kaleidoscope/KeyAddrBitfield.h
@@ -106,16 +106,6 @@ class KeyAddrBitfield {
   // ----------------------------------------------------------------------------
   // Iterator!
  public:
-  class Iterator;
-  friend class KeyAddrBitfield::Iterator;
-
-  Iterator begin() const {
-    return Iterator{*this, 0};
-  }
-  Iterator end() const {
-    return Iterator{*this, total_blocks};
-  }
-
   class Iterator {
    public:
     Iterator(const KeyAddrBitfield &bitfield, uint8_t x)
@@ -171,6 +161,15 @@ class KeyAddrBitfield {
 
   }; // class Iterator {
 
+  friend class Iterator;
+
+  Iterator begin() const {
+    return Iterator{*this, 0};
+  }
+  Iterator end() const {
+    return Iterator{*this, total_blocks};
+  }
+
 } __attribute__((packed)); // class KeyAddrBitfield {
 
 } // namespace kaleidoscope {