Simplify and micro-optimize hidden_checkers()

[stockfish] / src / position.h

diff --git a/src/position.h b/src/position.h
index f326e4fbaa99b3fa27955abc6948398511dfb24b..9ed72393bfc4f6a595a93e467f6cb235d66ce956 100644 (file)
--- a/src/position.h
+++ b/src/position.h
@@ -89,8 +89,9 @@ struct StateInfo {
 
 class Position {
 
-  Position(); // No default or copy c'tor allowed
-  Position(const Position& pos);
+  // No default or copy c'tor allowed, default c'tor will not be generated
+  // anyhow because of user-defined c'tors.
+  Position(const Position&);
 
 public:
   Position(const Position& pos, int threadID);
@@ -221,7 +222,7 @@ private:
   void put_piece(Piece p, Square s);
   void set_castle(int f, Square ksq, Square rsq);
   void set_castling_rights(char token);
-  bool move_is_pl_slow(const Move m) const;
+  bool move_is_legal(const Move m) const;
 
   // Helper functions for doing and undoing moves
   void do_capture_move(Key& key, PieceType capture, Color them, Square to, bool ep);
@@ -449,15 +450,14 @@ inline bool Position::is_chess960() const {
 
 inline bool Position::move_is_capture_or_promotion(Move m) const {
 
-  assert(m != MOVE_NONE && m != MOVE_NULL);
+  assert(move_is_ok(m));
   return move_is_special(m) ? !move_is_castle(m) : !square_is_empty(move_to(m));
 }
 
 inline bool Position::move_is_capture(Move m) const {
 
-  assert(m != MOVE_NONE && m != MOVE_NULL);
-
   // Note that castle is coded as "king captures the rook"
+  assert(move_is_ok(m));
   return (!square_is_empty(move_to(m)) && !move_is_castle(m)) || move_is_ep(m);
 }