X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbitcount.h;h=7609da40c30c2282ecc3dab112a70b7185bbef1d;hp=0754f32e7292aacb0a005594645a04d8ba6896d6;hb=77fa960f8923ca83ba0391835d50f4230ac6a345;hpb=42b48b08e81b55e385e55b3074b7c59d81809a45 diff --git a/src/bitcount.h b/src/bitcount.h index 0754f32e..7609da40 100644 --- a/src/bitcount.h +++ b/src/bitcount.h @@ -2,13 +2,13 @@ Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - Stockfish is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -22,6 +22,7 @@ #define BITCOUNT_H_INCLUDED #include + #include "types.h" enum BitCountType { @@ -35,7 +36,7 @@ enum BitCountType { /// Determine at compile time the best popcount<> specialization according to /// whether the platform is 32 or 64 bit, the maximum number of non-zero /// bits to count and if the hardware popcnt instruction is available. -const BitCountType Full = HasPopCnt ? CNT_HW_POPCNT : Is64Bit ? CNT_64 : CNT_32; +const BitCountType Full = HasPopCnt ? CNT_HW_POPCNT : Is64Bit ? CNT_64 : CNT_32; const BitCountType Max15 = HasPopCnt ? CNT_HW_POPCNT : Is64Bit ? CNT_64_MAX15 : CNT_32_MAX15; @@ -94,7 +95,7 @@ inline int popcount(Bitboard b) { return (int)__popcnt64(b); -#else +#else // Assumed gcc or compatible compiler return __builtin_popcountll(b);