X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=896619dca867682ed9764f404ee9c2ecf1e20311;hp=b66cc67f310105710d7682615420159f6db2dbca;hb=a6e292034a60597d8d0a3dc00e9c1eb94b1112ac;hpb=314d446518daa035526be8539b23957ba4678468 diff --git a/src/position.h b/src/position.h index b66cc67f..896619dc 100644 --- a/src/position.h +++ b/src/position.h @@ -50,7 +50,7 @@ struct CheckInfo { struct StateInfo { Key pawnKey, materialKey; - Value npMaterial[COLOR_NB]; + Value nonPawnMaterial[COLOR_NB]; int castlingRights, rule50, pliesFromNull; Score psq; Square epSquare; @@ -76,10 +76,13 @@ class Position { friend std::ostream& operator<<(std::ostream&, const Position&); + // Disable the default copy constructor + Position(const Position&); + public: Position() {} - Position(const Position& pos, Thread* t) { *this = pos; thisThread = t; } - Position(const std::string& f, bool c960, Thread* t) { set(f, c960, t); } + Position(const Position& pos, Thread* th) { *this = pos; thisThread = th; } + Position(const std::string& f, bool c960, Thread* th) { set(f, c960, th); } Position& operator=(const Position&); static void init(); @@ -114,7 +117,7 @@ public: // Attacks to/from a given square Bitboard attackers_to(Square s) const; - Bitboard attackers_to(Square s, Bitboard occ) const; + Bitboard attackers_to(Square s, Bitboard occupied) const; Bitboard attacks_from(Piece pc, Square s) const; template Bitboard attacks_from(Square s) const; template Bitboard attacks_from(Square s, Color c) const; @@ -346,7 +349,7 @@ inline Score Position::psq_score() const { } inline Value Position::non_pawn_material(Color c) const { - return st->npMaterial[c]; + return st->nonPawnMaterial[c]; } inline int Position::game_ply() const {