From: Marco Costalba <mcostalba@gmail.com>
Date: Sat, 7 Feb 2015 09:31:47 +0000 (+0100)
Subject: Sync with master
X-Git-Url: https://git.sesse.net/?p=stockfish;a=commitdiff_plain;h=1277a428237eec3299c6606951fac014bb3ef851

Sync with master

bench: 7696257
---

1277a428237eec3299c6606951fac014bb3ef851
diff --cc src/material.cpp
index e2294212,9873a44e..ebf5adff
--- a/src/material.cpp
+++ b/src/material.cpp
@@@ -139,20 -136,15 +136,15 @@@ Entry* probe(const Position& pos) 
    // Let's look if we have a specialized evaluation function for this particular
    // material configuration. Firstly we look for a fixed configuration one, then
    // for a generic one if the previous search failed.
 -  if (pos.this_thread()->endgames.probe(key, e->evaluationFunction))
 +  if ((e->evaluationFunction = pos.this_thread()->endgames.probe<Value>(key)) != nullptr)
        return e;
  
-   if (is_KXK<WHITE>(pos))
-   {
-       e->evaluationFunction = &EvaluateKXK[WHITE];
-       return e;
-   }
- 
-   if (is_KXK<BLACK>(pos))
-   {
-       e->evaluationFunction = &EvaluateKXK[BLACK];
-       return e;
-   }
+   for (Color c = WHITE; c <= BLACK; ++c)
+       if (is_KXK(pos, c))
+       {
+           e->evaluationFunction = &EvaluateKXK[c];
+           return e;
+       }
  
    // OK, we didn't find any special evaluation function for the current material
    // configuration. Is there a suitable specialized scaling function?