X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;h=4984d08ce53c5344b8e1937fb7f8263df6e8e819;hp=a01a3c2c08c4b4089296129a0291734b548af04b;hb=c45818e9f86fea63a6b46d0726cdcfe87516d01b;hpb=7013efce4e2d5e0b4834f4fccec98b03b972d629

diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index a01a3c2c..4984d08c 100644
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -926,7 +926,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);
@@ -1077,7 +1077,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);
@@ -1104,7 +1104,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)
     {