Retire struct OptionsMap

[stockfish] / src / ucioption.h

diff --git a/src/ucioption.h b/src/ucioption.h
index c57cf021e8c681ab7c389cac8c5143e53ee97c61..b78bf6fdf4c4108f6edc97b2cfeadb37737f7092 100644 (file)
--- a/src/ucioption.h
+++ b/src/ucioption.h
@@ -25,7 +25,15 @@
 #include <map>
 #include <string>
 
-struct OptionsMap;
+class UCIOption;
+
+/// Custom comparator because UCI options should be case insensitive
+struct CaseInsensitiveLess {
+  bool operator() (const std::string&, const std::string&) const;
+};
+
+/// Our options container is actually a std::map
+typedef std::map<std::string, UCIOption, CaseInsensitiveLess> OptionsMap;
 
 /// UCIOption class implements an option as defined by UCI protocol
 class UCIOption {
@@ -38,7 +46,7 @@ public:
   UCIOption(const char* v, Fn* = NULL);
   UCIOption(int v, int min, int max, Fn* = NULL);
 
-  void operator=(const std::string& v);
+  UCIOption& operator=(const std::string& v);
 
   operator int() const {
     assert(type == "check" || type == "spin");
@@ -59,19 +67,8 @@ private:
   Fn* on_change;
 };
 
-
-/// Custom comparator because UCI options should be case insensitive
-struct CaseInsensitiveLess {
-  bool operator() (const std::string&, const std::string&) const;
-};
-
-
-/// Our options container is actually a map with a customized c'tor
-struct OptionsMap : public std::map<std::string, UCIOption, CaseInsensitiveLess> {
-  OptionsMap();
-};
-
-extern std::ostream& operator<<(std::ostream&, const OptionsMap&);
 extern OptionsMap Options;
 
+namespace UCIOptions { void init(OptionsMap&); }
+
 #endif // !defined(UCIOPTION_H_INCLUDED)