Accessor for SquareBB #2067

[stockfish] / src / bitboard.h

diff --git a/src/bitboard.h b/src/bitboard.h
index af7b592ad564cb5a3af85ca97173d5259e390484..6907f184e5429c12866d504e3e69a6ca49979658 100644 (file)
--- a/src/bitboard.h
+++ b/src/bitboard.h
@@ -106,30 +106,16 @@ extern Magic BishopMagics[SQUARE_NB];
 /// Overloads of bitwise operators between a Bitboard and a Square for testing
 /// whether a given bit is set in a bitboard, and for setting and clearing bits.
 
 /// Overloads of bitwise operators between a Bitboard and a Square for testing
 /// whether a given bit is set in a bitboard, and for setting and clearing bits.
 

-inline Bitboard operator&(Bitboard b, Square s) {
+inline Bitboard square_bb(Square s) {

   assert(s >= SQ_A1 && s <= SQ_H8);
   assert(s >= SQ_A1 && s <= SQ_H8);

-  return b & SquareBB[s];
-}
-
-inline Bitboard operator|(Bitboard b, Square s) {
-  assert(s >= SQ_A1 && s <= SQ_H8);
-  return b | SquareBB[s];
-}
-
-inline Bitboard operator^(Bitboard b, Square s) {
-  assert(s >= SQ_A1 && s <= SQ_H8);
-  return b ^ SquareBB[s];
-}
-
-inline Bitboard& operator|=(Bitboard& b, Square s) {
-  assert(s >= SQ_A1 && s <= SQ_H8);
-  return b |= SquareBB[s];
-}
-
-inline Bitboard& operator^=(Bitboard& b, Square s) {
-  assert(s >= SQ_A1 && s <= SQ_H8);
-  return b ^= SquareBB[s];
-}
+  return SquareBB[s];
+}
+  
+inline Bitboard  operator&( Bitboard  b, Square s) { return b &  square_bb(s); }
+inline Bitboard  operator|( Bitboard  b, Square s) { return b |  square_bb(s); }
+inline Bitboard  operator^( Bitboard  b, Square s) { return b ^  square_bb(s); }
+inline Bitboard& operator|=(Bitboard& b, Square s) { return b |= square_bb(s); }
+inline Bitboard& operator^=(Bitboard& b, Square s) { return b ^= square_bb(s); }

 
 constexpr bool more_than_one(Bitboard b) {
   return b & (b - 1);
 
 constexpr bool more_than_one(Bitboard b) {
   return b & (b - 1);