X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpawns.h;h=549aafa90b46c8290c80332af9e644edf0f6ee52;hp=0e7ca61d49fbc7de10397608bbe944baf2b1a08f;hb=0fcda095df1caa860e8e3f3a714d5545ec9dc122;hpb=fa2478a81f42648aa3382d60280e01adb0c4536f

diff --git a/src/pawns.h b/src/pawns.h
index 0e7ca61d..549aafa9 100644
--- a/src/pawns.h
+++ b/src/pawns.h
@@ -17,21 +17,13 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #if !defined(PAWNS_H_INCLUDED)
 #define PAWNS_H_INCLUDED
 
-////
-//// Includes
-////
-
 #include "bitboard.h"
 #include "position.h"
-#include "value.h"
-
-////
-//// Types
-////
+#include "tt.h"
+#include "types.h"
 
 const int PawnTableSize = 16384;
 
@@ -69,32 +61,26 @@ private:
   Score kingShelters[2];
 };
 
-/// The PawnInfoTable class represents a pawn hash table.  It is basically
-/// just an array of PawnInfo objects and a few methods for accessing these
-/// objects.  The most important method is get_pawn_info, which looks up a
-/// position in the table and returns a pointer to a PawnInfo object.
 
-class PawnInfoTable {
+/// The PawnInfoTable class represents a pawn hash table. The most important
+/// method is get_pawn_info, which returns a pointer to a PawnInfo object.
+
+class PawnInfoTable : public SimpleHash<PawnInfo, PawnTableSize> {
 
   enum SideType { KingSide, QueenSide };
 
 public:
-  PawnInfoTable();
-  ~PawnInfoTable();
   PawnInfo* get_pawn_info(const Position& pos) const;
   void prefetch(Key key) const;
 
 private:
   template<Color Us>
   Score evaluate_pawns(const Position& pos, Bitboard ourPawns, Bitboard theirPawns, PawnInfo* pi) const;
-
-  PawnInfo* entries;
 };
 
-
-////
-//// Inline functions
-////
+inline Square pawn_push(Color c) {
+  return c == WHITE ? DELTA_N : DELTA_S;
+}
 
 inline void PawnInfoTable::prefetch(Key key) const {