X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fbitboard.cpp;h=8250e829713020bb7d13cf061eb41f39bc9082e6;hb=7dd0c39714cbb6829d7cbf9da36fa46995e7a61e;hp=298db7a7ee357764540bd61990df8f84929e63a6;hpb=060eef4f4e97ea1261252256c6768b243b7d3de5;p=stockfish diff --git a/src/bitboard.cpp b/src/bitboard.cpp index 298db7a7..8250e829 100644 --- a/src/bitboard.cpp +++ b/src/bitboard.cpp @@ -21,14 +21,14 @@ //// Includes //// -#ifdef _MSC_VER - #include - #ifdef _WIN64 - #pragma intrinsic(_BitScanForward64) - #else - #pragma intrinsic(_BitScanForward) - #endif - #define USING_INTRINSICS +#ifdef _MSC_VER + #include + #ifdef _WIN64 + #pragma intrinsic(_BitScanForward64) + #else + #pragma intrinsic(_BitScanForward) + #endif + #define USING_INTRINSICS #endif #include @@ -284,7 +284,7 @@ namespace { #if defined(USE_COMPACT_ROOK_ATTACKS) void init_file_and_rank_attacks(); #endif -}; +} //// @@ -356,22 +356,22 @@ Square first_1(Bitboard b) { Square pop_1st_bit(Bitboard *b) { - unsigned long index; - uint32_t *l, *h; - - if (*(l = (uint32_t*)b) != 0) - { - _BitScanForward(&index, *l); - *l &= ~(1 << index); - } - else if (*(h = (uint32_t*)b + 1) != 0) - { - _BitScanForward(&index, *h); - *h &= ~(1 << index); - index += 32; - } else - return SQ_NONE; - + unsigned long index; + uint32_t *l, *h; + + if (*(l = (uint32_t*)b) != 0) + { + _BitScanForward(&index, *l); + *l &= ~(1 << index); + } + else if (*(h = (uint32_t*)b + 1) != 0) + { + _BitScanForward(&index, *h); + *h &= ~(1 << index); + index += 32; + } else + return SQ_NONE; + return Square(index); }