X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fucioption.h;h=c764ac8bb088636cb8b9aec08aa2e39a2d35773a;hp=a5da2e440b768e50f3fa11f50700e11983f3b2e0;hb=3a76163aba434fb2edaa333aca506e1eb795a75e;hpb=786564068bb22c750c41649733d4aa6733accaec

diff --git a/src/ucioption.h b/src/ucioption.h
index a5da2e44..c764ac8b 100644
--- a/src/ucioption.h
+++ b/src/ucioption.h
@@ -25,18 +25,18 @@
 #include <map>
 #include <string>
 
-class Option {
+class UCIOption {
 public:
-  Option() {} // To be used in a std::map
-  Option(const char* defaultValue);
-  Option(bool defaultValue, std::string type = "check");
-  Option(int defaultValue, int minValue, int maxValue);
+  UCIOption() {} // To be used in a std::map
+  UCIOption(const char* defaultValue);
+  UCIOption(bool defaultValue, std::string type = "check");
+  UCIOption(int defaultValue, int minValue, int maxValue);
 
   void set_value(const std::string& v);
   template<typename T> T value() const;
 
 private:
-  friend class OptionsMap;
+  friend struct OptionsMap;
 
   std::string defaultValue, currentValue, type;
   int minValue, maxValue;
@@ -44,15 +44,14 @@ private:
 };
 
 
-/// Custom comparator because UCI options should not be case sensitive
+/// 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
-class OptionsMap : public std::map<std::string, Option, CaseInsensitiveLess> {
-public:
+struct OptionsMap : std::map<std::string, UCIOption, CaseInsensitiveLess> {
   OptionsMap();
   std::string print_all() const;
 };
@@ -62,21 +61,21 @@ extern OptionsMap Options;
 
 /// Option::value() definition and specializations
 template<typename T>
-T Option::value() const {
+T UCIOption::value() const {
 
   assert(type == "spin");
   return T(atoi(currentValue.c_str()));
 }
 
 template<>
-inline std::string Option::value<std::string>() const {
+inline std::string UCIOption::value<std::string>() const {
 
   assert(type == "string");
   return currentValue;
 }
 
 template<>
-inline bool Option::value<bool>() const {
+inline bool UCIOption::value<bool>() const {
 
   assert(type == "check" || type == "button");
   return currentValue == "true";