X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbitboard.cpp;h=57b24e2ef61b88ce5a4785b368df05739ffbbd44;hp=04e5204b5d680d417c7df587379e3d3a9f0c35d5;hb=6482ce2bb2cb2c2450008afb58c7ef2e04d56841;hpb=8307da0de77c9c7bbf7c56a7d9c8a688ff4dfb4e

diff --git a/src/bitboard.cpp b/src/bitboard.cpp
index 04e5204b..57b24e2e 100644
--- a/src/bitboard.cpp
+++ b/src/bitboard.cpp
@@ -154,7 +154,7 @@ Square pop_1st_bit(Bitboard* bb) {
 void bitboards_init() {
 
   for (Bitboard b = 0; b < 256; b++)
-      BitCount8Bit[b] = (uint8_t)count_1s<CNT32_MAX15>(b);
+      BitCount8Bit[b] = (uint8_t)popcount<Max15>(b);
 
   for (Square s = SQ_A1; s <= SQ_H8; s++)
   {
@@ -203,7 +203,7 @@ void bitboards_init() {
           Bitboard b = 1ULL << i;
           b ^= b - 1;
           b ^= b >> 32;
-          BSFTable[uint32_t(b * 0x783A9B23) >> 26] = i;
+          BSFTable[(uint32_t)(b * 0x783A9B23) >> 26] = i;
       }
       else
           BSFTable[((1ULL << i) * 0x218A392CD3D5DBFULL) >> 58] = i;
@@ -321,7 +321,7 @@ namespace {
         // the number of 1s of the mask. Hence we deduce the size of the shift to
         // apply to the 64 or 32 bits word to get the index.
         masks[s]  = sliding_attacks(pt, s, 0) & ~edges;
-        shifts[s] = (Is64Bit ? 64 : 32) - count_1s<CNT32_MAX15>(masks[s]);
+        shifts[s] = (Is64Bit ? 64 : 32) - popcount<Max15>(masks[s]);
 
         // Use Carry-Rippler trick to enumerate all subsets of masks[s] and
         // store the corresponding sliding attacks bitboard in reference[].