X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fposition.h;h=a051ec382f49fe15a0d3ee55238e97a48c1158ac;hb=21850536d54c3f142f1907e31ac0bfab8f4a8862;hp=187fa72ae6f1a92e6b8a7e4e134eab15d8af79e9;hpb=84d6fe0f31069bc612f856ab7cd54d9aad7907ca;p=stockfish

diff --git a/src/position.h b/src/position.h
index 187fa72a..a051ec38 100644
--- a/src/position.h
+++ b/src/position.h
@@ -185,7 +185,6 @@ public:
 
   // Bitboards for pinned pieces and discovered check candidates
   Bitboard discovered_check_candidates(Color c) const;
-  Bitboard pinned_pieces(Color c, Bitboard& p) const;
   Bitboard pinned_pieces(Color c) const;
 
   // Checking pieces and under check information
@@ -197,9 +196,9 @@ public:
 
   // Information about attacks to or from a given square
   Bitboard attackers_to(Square s) const;
-  Bitboard piece_attacks_from(Piece p, Square s) const;
-  Bitboard pawn_attacks_from(Square s, Color c) const;
-  template<PieceType> Bitboard piece_attacks_from(Square s) const;
+  Bitboard attacks_from(Piece p, Square s) const;
+  template<PieceType> Bitboard attacks_from(Square s) const;
+  template<PieceType> Bitboard attacks_from(Square s, Color c) const;
 
   // Properties of moves
   bool pl_move_is_legal(Move m) const;
@@ -432,33 +431,29 @@ inline Square Position::initial_qr_square(Color c) const {
   return relative_square(c, make_square(initialQRFile, RANK_1));
 }
 
-inline Bitboard Position::pawn_attacks_from(Square s, Color c) const {
+template<>
+inline Bitboard Position::attacks_from<PAWN>(Square s, Color c) const {
   return StepAttackBB[piece_of_color_and_type(c, PAWN)][s];
 }
 
-template<PieceType Piece> // Knight and King
-inline Bitboard Position::piece_attacks_from(Square s) const {
+template<PieceType Piece> // Knight and King and white pawns
+inline Bitboard Position::attacks_from(Square s) const {
   return StepAttackBB[Piece][s];
 }
 
 template<>
-inline Bitboard Position::piece_attacks_from<PAWN>(Square s) const {
-  return StepAttackBB[WP][s] | StepAttackBB[BP][s];
-}
-
-template<>
-inline Bitboard Position::piece_attacks_from<BISHOP>(Square s) const {
+inline Bitboard Position::attacks_from<BISHOP>(Square s) const {
   return bishop_attacks_bb(s, occupied_squares());
 }
 
 template<>
-inline Bitboard Position::piece_attacks_from<ROOK>(Square s) const {
+inline Bitboard Position::attacks_from<ROOK>(Square s) const {
   return rook_attacks_bb(s, occupied_squares());
 }
 
 template<>
-inline Bitboard Position::piece_attacks_from<QUEEN>(Square s) const {
-  return piece_attacks_from<ROOK>(s) | piece_attacks_from<BISHOP>(s);
+inline Bitboard Position::attacks_from<QUEEN>(Square s) const {
+  return attacks_from<ROOK>(s) | attacks_from<BISHOP>(s);
 }
 
 inline Bitboard Position::checkers() const {