X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=f3839bf024d9e03a81db31cb93dadf8e475f7ca9;hp=57fe1c0ec304a76fd2542e97876c811eac92b6d2;hb=800410eef1c0811d046ee2332b3afda21284b876;hpb=38cfbeeb50c7dde79450f1b44171d5655e555ae5

diff --git a/src/movepick.h b/src/movepick.h
index 57fe1c0e..f3839bf0 100644
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -17,11 +17,11 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined MOVEPICK_H_INCLUDED
+#ifndef MOVEPICK_H_INCLUDED
 #define MOVEPICK_H_INCLUDED
 
 #include <algorithm> // For std::max
-#include <cstring>   // For memset
+#include <cstring>   // For std::memset
 
 #include "movegen.h"
 #include "position.h"
@@ -43,7 +43,7 @@ struct Stats {
   static const Value Max = Value(2000);
 
   const T* operator[](Piece p) const { return table[p]; }
-  void clear() { memset(table, 0, sizeof(table)); }
+  void clear() { std::memset(table, 0, sizeof(table)); }
 
   void update(Piece p, Square to, Move m) {
 
@@ -86,7 +86,8 @@ class MovePicker {
 public:
   MovePicker(const Position&, Move, Depth, const HistoryStats&, Square);
   MovePicker(const Position&, Move, const HistoryStats&, PieceType);
-  MovePicker(const Position&, Move, Depth, const HistoryStats&, Move*, Search::Stack*, Value);
+  MovePicker(const Position&, Move, Depth, const HistoryStats&, Move*, Search::Stack*);
+ ~MovePicker();
 
   template<bool SpNode> Move next_move();
 
@@ -100,11 +101,10 @@ private:
   Move* countermoves;
   Depth depth;
   Move ttMove;
-  MoveStack killers[4];
+  ExtMove killers[4];
   Square recaptureSquare;
-  int captureThreshold, phase;
-  MoveStack *cur, *end, *endQuiets, *endBadCaptures;
-  MoveStack moves[MAX_MOVES];
+  int captureThreshold, stage;
+  ExtMove *moves, *cur, *end, *endQuiets, *endBadCaptures;
 };
 
-#endif // !defined(MOVEPICK_H_INCLUDED)
+#endif // #ifndef MOVEPICK_H_INCLUDED