Introduce move_pawns() helper in movegen.cpp

[stockfish] / src / movepick.h

diff --git a/src/movepick.h b/src/movepick.h
index 5fff409259c1cfd8d1544b277c06c85715ede770..a5403e096a834d2d9538ae29827109d2d1d828f8 100644 (file)
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -47,6 +47,8 @@ struct SearchStack;
 
 class MovePicker {
 
+  MovePicker& operator=(const MovePicker&); // Silence a warning under MSVC
+
 public:
 
   enum MovegenPhase {
@@ -63,7 +65,7 @@ public:
     PH_STOP
   };
 
-  MovePicker(const Position& p, bool pvnode, Move ttm, const SearchStack& ss, Depth d, EvalInfo* ei = NULL);
+  MovePicker(const Position& p, bool pvnode, Move ttm, const SearchStack& ss, Depth d);
   Move get_next_move();
   Move get_next_move(Lock &lock);
   int number_of_moves() const;
@@ -83,14 +85,14 @@ private:
   int find_best_index(Bitboard* squares, int values[]);
 
   const Position& pos;
-  Move ttMove, mateKiller, killer1, killer2, threatMove;
+  Move ttMove, mateKiller, killer1, killer2;
   Bitboard pinned, dc;
   MoveStack moves[256], badCaptures[64];
   bool pvNode;
   Depth depth;
   int phaseIndex;
   int numOfMoves, numOfBadCaptures;
-  int movesPicked, badCapturesPicked;
+  int movesPicked;
   bool finished;
 };
 
@@ -105,7 +107,6 @@ private:
 /// a single reply to check.
 
 inline int MovePicker::number_of_moves() const {
-
   return numOfMoves;
 }