Revert "Use a per-thread array"

[stockfish] / src / movepick.h

diff --git a/src/movepick.h b/src/movepick.h
index 8997c93872c46766bf137f1d4cc73cd46194f1a9..c444615f5b9f2e8ab4a0952ff47e3c97bf642079 100644 (file)
--- 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,8 +86,7 @@ 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&,
-             const CountermovesStats&, Search::Stack*, Value);
+  MovePicker(const Position&, Move, Depth, const HistoryStats&, Move*, Search::Stack*);
 
   template<bool SpNode> Move next_move();
 
@@ -98,13 +97,14 @@ private:
   const Position& pos;
   const HistoryStats& history;
   Search::Stack* ss;
+  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 *cur, *end, *endQuiets, *endBadCaptures;
+  ExtMove moves[MAX_MOVES];
 };
 
-#endif // !defined(MOVEPICK_H_INCLUDED)
+#endif // #ifndef MOVEPICK_H_INCLUDED