simplify opposite_colors

protonspring · Stéphane Nicolet · commit fefc0c67898e · 2018-12-09T12:59:57.000+01:00
diff --git a/src/bitboard.h b/src/bitboard.h
@@ -135,6 +135,10 @@ constexpr bool more_than_one(Bitboard b) {
   return b & (b - 1);
 }
 
+inline bool opposite_colors(Square s1, Square s2) {
+  return bool(DarkSquares & s1) != bool(DarkSquares & s2);
+}
+
 /// rank_bb() and file_bb() return a bitboard representing all the squares on
 /// the given file or rank.
 
diff --git a/src/types.h b/src/types.h
@@ -413,11 +413,6 @@ constexpr Rank relative_rank(Color c, Square s) {
   return relative_rank(c, rank_of(s));
 }
 
-inline bool opposite_colors(Square s1, Square s2) {
-  int s = int(s1) ^ int(s2);
-  return ((s >> 3) ^ s) & 1;
-}
-
 constexpr Direction pawn_push(Color c) {
   return c == WHITE ? NORTH : SOUTH;
 }

Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,10 @@ constexpr bool more_than_one(Bitboard b) {`
`135`	`135`	`return b & (b - 1);`
`136`	`136`	`}`
`137`	`137`
	`138`	`+inline bool opposite_colors(Square s1, Square s2) {`
	`139`	`+ return bool(DarkSquares & s1) != bool(DarkSquares & s2);`
	`140`	`+}`
	`141`	`+`
`138`	`142`	`/// rank_bb() and file_bb() return a bitboard representing all the squares on`
`139`	`143`	`/// the given file or rank.`
`140`	`144`
Original file line number	Diff line number	Diff line change
`@@ -413,11 +413,6 @@ constexpr Rank relative_rank(Color c, Square s) {`
`413`	`413`	`return relative_rank(c, rank_of(s));`
`414`	`414`	`}`
`415`	`415`
`416`		`-inline bool opposite_colors(Square s1, Square s2) {`
`417`		`- int s = int(s1) ^ int(s2);`
`418`		`- return ((s >> 3) ^ s) & 1;`
`419`		`-}`
`420`		`-`
`421`	`416`	`constexpr Direction pawn_push(Color c) {`
`422`	`417`	`return c == WHITE ? NORTH : SOUTH;`
`423`	`418`	`}`