X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fendgame.h;h=7ff70373752fe85264caa2b82c14270b97ed403b;hb=3c07603dac03f0da20194097cf4eb1a396fea60d;hp=8a42eda29d1393891415af23f2e22d919c316955;hpb=c73f33f37e56048f4e137dd5e5118367eb072a05;p=stockfish

diff --git a/src/endgame.h b/src/endgame.h
index 8a42eda2..7ff70373 100644
--- a/src/endgame.h
+++ b/src/endgame.h
@@ -21,7 +21,10 @@
 #define ENDGAME_H_INCLUDED
 
 #include <map>
+#include <memory>
 #include <string>
+#include <type_traits>
+#include <utility>
 
 #include "position.h"
 #include "types.h"
@@ -63,11 +66,9 @@ enum EndgameType {
 
 
 /// Endgame functions can be of two types depending on whether they return a
-/// Value or a ScaleFactor. Type eg_fun<int>::type returns either ScaleFactor
-/// or Value depending on whether the template parameter is 0 or 1.
-
-template<int> struct eg_fun { typedef Value type; };
-template<> struct eg_fun<1> { typedef ScaleFactor type; };
+/// Value or a ScaleFactor.
+template<EndgameType E>
+using eg_fun = std::conditional<(E < SCALING_FUNCTIONS), Value, ScaleFactor>;
 
 
 /// Base and derived templates for endgame evaluation and scaling functions
@@ -81,7 +82,7 @@ struct EndgameBase {
 };
 
 
-template<EndgameType E, typename T = typename eg_fun<(E > SCALING_FUNCTIONS)>::type>
+template<EndgameType E, typename T = typename eg_fun<E>::type>
 struct Endgame : public EndgameBase<T> {
 
   explicit Endgame(Color c) : strongSide(c), weakSide(~c) {}
@@ -99,24 +100,21 @@ private:
 
 class Endgames {
 
-  typedef std::map<Key, EndgameBase<eg_fun<0>::type>*> M1;
-  typedef std::map<Key, EndgameBase<eg_fun<1>::type>*> M2;
+  template<typename T> using Map = std::map<Key, std::unique_ptr<T>>;
 
-  M1 m1;
-  M2 m2;
+  template<EndgameType E, typename T = EndgameBase<typename eg_fun<E>::type>>
+  void add(const std::string& code);
 
-  M1& map(M1::mapped_type) { return m1; }
-  M2& map(M2::mapped_type) { return m2; }
+  template<typename T, int I = std::is_same<T, EndgameBase<ScaleFactor>>::value>
+  Map<T>& map() { return std::get<I>(maps); }
 
-  template<EndgameType E> void add(const std::string& code);
+  std::pair<Map<EndgameBase<Value>>, Map<EndgameBase<ScaleFactor>>> maps;
 
 public:
   Endgames();
- ~Endgames();
 
-  template<typename T> T probe(Key key, T& eg) {
-    return eg = map(eg).count(key) ? map(eg)[key] : NULL;
-  }
+  template<typename T> T* probe(Key key, T** eg)
+  { return *eg = map<T>().count(key) ? map<T>()[key].get() : nullptr; }
 };
 
 #endif // #ifndef ENDGAME_H_INCLUDED