Merge branch 'master' of https://github.com/official-stockfish/Stockfish
authorFabian Fichter <ianfab@users.noreply.github.com>
Fri, 19 Apr 2019 18:12:59 +0000 (20:12 +0200)
committerFabian Fichter <ianfab@users.noreply.github.com>
Fri, 19 Apr 2019 18:12:59 +0000 (20:12 +0200)
No functional change.

bench: 3359419

1  2 
src/bitboard.h
src/endgame.cpp
src/search.cpp

diff --cc src/bitboard.h
Simple merge
diff --cc src/endgame.cpp
@@@ -823,8 -667,8 +821,8 @@@ ScaleFactor Endgame<KBPPKB>::operator()
      if (   ksq == blockSq1
          && opposite_colors(ksq, wbsq)
          && (   bbsq == blockSq2
 -            || (pos.attacks_from<BISHOP>(blockSq2) & pos.pieces(weakSide, BISHOP))
 +            || (pos.attacks_from<BISHOP>(weakSide, blockSq2) & pos.pieces(weakSide, BISHOP))
-             || distance(r1, r2) >= 2))
+             || distance<Rank>(psq1, psq2) >= 2))
          return SCALE_FACTOR_DRAW;
  
      else if (   ksq == blockSq2
diff --cc src/search.cpp
Simple merge