X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;h=1f396f759dec73b90edd30aa1e406325cf4c725f;hp=4765094a2c4c237d95afee9459e743bc60cd4bcc;hb=894c43a1d648d4cf160de006bde59aa5b6ba0190;hpb=231f62baf7b6d9cee18bf7e85bed0fc9b78eed73

diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index 4765094a..1f396f75 100644
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -37,7 +37,7 @@ namespace {
 
     // Pointers to material and pawn hash table entries
     Material::Entry* mi;
-    PawnEntry* pi;
+    Pawns::Entry* pi;
 
     // attackedBy[color][piece type] is a bitboard representing all squares
     // attacked by a given color and piece type, attackedBy[color][0] contains
@@ -361,7 +361,7 @@ namespace {
 template<bool Trace>
 Value do_evaluate(const Position& pos, Value& margin) {
 
-  assert(!pos.in_check());
+  assert(!pos.checkers());
 
   EvalInfo ei;
   Score score, mobilityWhite, mobilityBlack;
@@ -405,7 +405,7 @@ Value do_evaluate(const Position& pos, Value& margin) {
   }
 
   // Probe the pawn hash table
-  ei.pi = pos.this_thread()->pawnTable.probe(pos);
+  ei.pi = Pawns::probe(pos, th->pawnsTable);
   score += ei.pi->pawns_value();
 
   // Initialize attack and king safety bitboards
@@ -1014,7 +1014,7 @@ Value do_evaluate(const Position& pos, Value& margin) {
 
             // Opponent king cannot block because path is defended and position
             // is not in check. So only friendly pieces can be blockers.
-            assert(!pos.in_check());
+            assert(!pos.checkers());
             assert((queeningPath & pos.pieces()) == (queeningPath & pos.pieces(c)));
 
             // Add moves needed to free the path from friendly pieces and retest condition