Indulge a bit on the template wizardy

[stockfish] / src / endgame.h

diff --git a/src/endgame.h b/src/endgame.h
index e35c7b0a1036d8f359e21084a008930036ff61ce..a9634738bee0232c5c03117d62a21688a1a465cf 100644 (file)
--- a/src/endgame.h
+++ b/src/endgame.h
@@ -89,24 +89,23 @@ private:
 /// and scaling base objects. Then we use polymorphism to invoke the actual
 /// endgame function calling its apply() method that is virtual.
 
-class Endgames {
+struct Endgames {
 
-  typedef std::map<Key, EndgameBase<Value>* > EFMap;
-  typedef std::map<Key, EndgameBase<ScaleFactor>* > SFMap;
+  template<typename T>
+  struct EMap { typedef std::map<Key, EndgameBase<T>*> type; };
 
-public:
   Endgames();
   ~Endgames();
-  template<class T> T* get(Key key) const;
+  template<typename T> EndgameBase<T>* get(Key key) const;
 
 private:
-  template<class T> void add(const std::string& keyCode);
+  template<typename T, EndgameType E> void add(const std::string& keyCode);
 
   // Here we store two maps, for evaluate and scaling functions...
-  std::pair<EFMap, SFMap> maps;
+  std::pair<EMap<Value>::type, EMap<ScaleFactor>::type> maps;
 
   // ...and here is the accessing template function
-  template<typename T> const std::map<Key, T*>& get() const;
+  template<typename T> const typename EMap<T>::type& map() const;
 };
 
 #endif // !defined(ENDGAME_H_INCLUDED)