From: Marco Costalba <mcostalba@gmail.com>
Date: Sat, 7 Mar 2015 09:52:55 +0000 (+0100)
Subject: Sync with master
X-Git-Url: https://git.sesse.net/?p=stockfish;a=commitdiff_plain;h=be509525336b65419e708678abe4e16efb5f6f4d;hp=-c

Sync with master

bench: 8285241
---

be509525336b65419e708678abe4e16efb5f6f4d
diff --combined src/pawns.cpp
index 0b5c59d3,396fd976..14086873
--- a/src/pawns.cpp
+++ b/src/pawns.cpp
@@@ -149,7 -149,7 +149,7 @@@ namespace 
          isolated    =  !neighbours;
  
          // Test for backward pawn.
 -        // If the pawn is passed, isolated, connected or a lever it cannot be
 +        // If the pawn is passed, isolated, lever or connected it cannot be
          // backward. If there are friendly pawns behind on adjacent files
          // it cannot be backward either.
          if (   (passed | isolated | lever | connected)
@@@ -294,14 -294,14 +294,14 @@@ Score Entry::do_king_safety(const Posit
  
    kingSquares[Us] = ksq;
    castlingRights[Us] = pos.can_castle(Us);
-   minKingPawnDistance[Us] = 0;
+   int minKingPawnDistance = 0;
  
    Bitboard pawns = pos.pieces(Us, PAWN);
    if (pawns)
-       while (!(DistanceRingBB[ksq][minKingPawnDistance[Us]++] & pawns)) {}
+       while (!(DistanceRingBB[ksq][minKingPawnDistance++] & pawns)) {}
  
    if (relative_rank(Us, ksq) > RANK_4)
-       return make_score(0, -16 * minKingPawnDistance[Us]);
+       return make_score(0, -16 * minKingPawnDistance);
  
    Value bonus = shelter_storm<Us>(pos, ksq);
  
@@@ -312,7 -312,7 +312,7 @@@
    if (pos.can_castle(MakeCastling<Us, QUEEN_SIDE>::right))
        bonus = std::max(bonus, shelter_storm<Us>(pos, relative_square(Us, SQ_C1)));
  
-   return make_score(bonus, -16 * minKingPawnDistance[Us]);
+   return make_score(bonus, -16 * minKingPawnDistance);
  }
  
  // Explicit template instantiation