X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovegen.h;h=62a121d7d291629e37aeebe32afe32fbc29776c6;hb=856a5f3aaaf8b9d53599963decacd4476b55c034;hp=6f1e24a4313107680c0508bd9a95722a3773af0d;hpb=60c121f3b1ee7d5ced3435cc1718e4e6e6fd8383;p=stockfish

diff --git a/src/movegen.h b/src/movegen.h
index 6f1e24a4..62a121d7 100644
--- a/src/movegen.h
+++ b/src/movegen.h
@@ -50,17 +50,18 @@ ExtMove* generate(const Position& pos, ExtMove* moveList);
 template<GenType T>
 struct MoveList {
 
-  explicit MoveList(const Position& pos) : last(generate<T>(pos, moveList)) {}
-  const ExtMove* begin() const { return moveList; }
-  const ExtMove* end() const { return last; }
+  explicit MoveList(const Position& pos) : cur(moveList), last(generate<T>(pos, moveList)) { last->move = MOVE_NONE; }
+  void operator++() { ++cur; }
+  Move operator*() const { return cur->move; }
   size_t size() const { return last - moveList; }
   bool contains(Move m) const {
-    for (const ExtMove& ms : *this) if (ms.move == m) return true;
+    for (const ExtMove* it(moveList); it != last; ++it) if (it->move == m) return true;
     return false;
   }
 
 private:
-  ExtMove moveList[MAX_MOVES], *last;
+  ExtMove moveList[MAX_MOVES];
+  ExtMove *cur, *last;
 };
 
 #endif // #ifndef MOVEGEN_H_INCLUDED