X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=a2ceb9902c2f3e05b2c19f1e3ba2d3a97ba1bc9f;hp=6667de704f3e15508f45b1b1239f46d88d536a9f;hb=fbb53524efd94c4b227c72c725c628a4aa5f9f72;hpb=7caa6cd3383cf90189a1947c9bdf9c6fea1172a6

diff --git a/src/position.h b/src/position.h
index 6667de70..a2ceb990 100644
--- a/src/position.h
+++ b/src/position.h
@@ -24,9 +24,9 @@
 #include <cstddef>
 
 #include "bitboard.h"
-#include "bitcount.h"
 #include "types.h"
 
+
 /// The checkInfo struct is initialized at c'tor time and keeps info used
 /// to detect if a move gives check.
 class Position;
@@ -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;
@@ -78,8 +78,8 @@ class 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();
 
@@ -100,7 +100,6 @@ public:
   bool empty(Square s) const;
   template<PieceType Pt> int count(Color c) const;
   template<PieceType Pt> const Square* list(Color c) const;
-  int total_piece_count() const;
 
   // Castling
   int can_castle(Color c) const;
@@ -115,7 +114,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<PieceType> Bitboard attacks_from(Square s) const;
   template<PieceType> Bitboard attacks_from(Square s, Color c) const;
@@ -347,7 +346,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 {
@@ -358,10 +357,6 @@ inline int Position::rule50_count() const {
   return st->rule50;
 }
 
-inline int Position::total_piece_count() const {
-  return HasPopCnt ? popcount<Full>(pieces()) : pieceCount[WHITE][ALL_PIECES];
-}
-
 inline bool Position::opposite_bishops() const {
 
   return   pieceCount[WHITE][BISHOP] == 1
@@ -412,8 +407,7 @@ inline void Position::put_piece(Square s, Color c, PieceType pt) {
   byColorBB[c] |= s;
   index[s] = pieceCount[c][pt]++;
   pieceList[c][pt][index[s]] = s;
-  if (!HasPopCnt)
-      pieceCount[WHITE][ALL_PIECES]++;
+  pieceCount[c][ALL_PIECES]++;
 }
 
 inline void Position::move_piece(Square from, Square to, Color c, PieceType pt) {
@@ -444,8 +438,7 @@ inline void Position::remove_piece(Square s, Color c, PieceType pt) {
   index[lastSquare] = index[s];
   pieceList[c][pt][index[lastSquare]] = lastSquare;
   pieceList[c][pt][pieceCount[c][pt]] = SQ_NONE;
-  if (!HasPopCnt)
-      pieceCount[WHITE][ALL_PIECES]--;
+  pieceCount[c][ALL_PIECES]--;
 }
 
 #endif // #ifndef POSITION_H_INCLUDED