X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fbitcount.h;h=ad8df94ab078522066fdfa44da80c931fa732c88;hb=f31847302d4ec62f4da7d22447d6c9fbf36230dc;hp=a69ad8e8418535fbe01645368800815d19491b9f;hpb=9204a60dbbebf7e319bb588acc91bf691a3ede9a;p=stockfish
diff --git a/src/bitcount.h b/src/bitcount.h
index a69ad8e8..ad8df94a 100644
--- a/src/bitcount.h
+++ b/src/bitcount.h
@@ -1,7 +1,7 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, 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
@@ -18,7 +18,7 @@
along with this program. If not, see .
*/
-#if !defined(BITCOUNT_H_INCLUDED)
+#ifndef BITCOUNT_H_INCLUDED
#define BITCOUNT_H_INCLUDED
#include
@@ -81,7 +81,7 @@ inline int popcount(Bitboard b) {
template<>
inline int popcount(Bitboard b) {
-#if !defined(USE_POPCNT)
+#ifndef USE_POPCNT
assert(false);
return b != 0; // Avoid 'b not used' warning
@@ -96,11 +96,10 @@ inline int popcount(Bitboard b) {
#else
- unsigned long ret;
- __asm__("popcnt %1, %0" : "=r" (ret) : "r" (b));
- return ret;
+ __asm__("popcnt %1, %0" : "=r" (b) : "r" (b));
+ return b;
#endif
}
-#endif // !defined(BITCOUNT_H_INCLUDED)
+#endif // #ifndef BITCOUNT_H_INCLUDED