Silence a bunch of warnings under MSVC /W4

[stockfish] / src / movepick.h

diff --git a/src/movepick.h b/src/movepick.h
index 8f809ca9900312b263906fb4a5cddc75bdcbca4d..a5403e096a834d2d9538ae29827109d2d1d828f8 100644 (file)
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -28,7 +28,6 @@
 #include "depth.h"
 #include "lock.h"
 #include "position.h"
-#include "search.h"
 
 
 ////
@@ -36,6 +35,7 @@
 ////
 
 struct EvalInfo;
+struct SearchStack;
 
 /// MovePicker is a class which is used to pick one legal move at a time from
 /// the current position.  It is initialized with a Position object and a few
@@ -47,6 +47,8 @@ struct EvalInfo;
 
 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;
@@ -80,7 +82,7 @@ private:
   void score_qcaptures();
   Move pick_move_from_list();
   int find_best_index();
-  int MovePicker::find_best_index(Bitboard* squares, int values[]);
+  int find_best_index(Bitboard* squares, int values[]);
 
   const Position& pos;
   Move ttMove, mateKiller, killer1, killer2;
@@ -90,7 +92,7 @@ private:
   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;
 }