X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;h=269e80624588c8267cfe31b29fe41e8aba8053b6;hp=ee626433019e2a3274636609081e7346b42edbef;hb=a96cba0ec89e5a3bbd435fccca652678c9fd20a7;hpb=2c955f25de9d4c263b6e6d37fef06b378eec49a0

diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index ee626433..269e8062 100644
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -918,7 +918,7 @@ namespace {
         {
             Square s = pop_1st_bit(&b);
 
-            assert(pos.piece_on(s) == pawn_of_color(us));
+            assert(pos.piece_on(s) == piece_of_color_and_type(us, PAWN));
             assert(pos.pawn_is_passed(us, s));
 
             int r = int(relative_rank(us, s) - RANK_2);
@@ -1069,7 +1069,7 @@ namespace {
   void evaluate_trapped_bishop_a7h7(const Position &pos, Square s, Color us,
                                     EvalInfo &ei) {
     assert(square_is_ok(s));
-    assert(pos.piece_on(s) == bishop_of_color(us));
+    assert(pos.piece_on(s) == piece_of_color_and_type(us, BISHOP));
 
     Square b6 = relative_square(us, (square_file(s) == FILE_A) ? SQ_B6 : SQ_G6);
     Square b8 = relative_square(us, (square_file(s) == FILE_A) ? SQ_B8 : SQ_G8);
@@ -1096,7 +1096,7 @@ namespace {
 
     assert(Chess960);
     assert(square_is_ok(s));
-    assert(pos.piece_on(s) == bishop_of_color(us));
+    assert(pos.piece_on(s) == piece_of_color_and_type(us, BISHOP));
 
     if (square_file(s) == FILE_A)
     {