Templetize make_move() helpers

[stockfish] / src / ucioption.cpp

diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index df73670b23d090df0922b25604fd2b16c226100b..763db556654e4c87828854bc7290d056ba8038da 100644 (file)
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -45,7 +45,7 @@ bool ci_less(char c1, char c2) { return tolower(c1) < tolower(c2); }
 }
 
 bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const {
-  return lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(), ci_less);
+  return std::lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(), ci_less);
 }
 
 
@@ -73,7 +73,7 @@ OptionsMap::OptionsMap() {
   o["Cowardice"]                   = UCIOption(100, 0, 200, on_eval);
   o["Min Split Depth"]             = UCIOption(msd, 4, 7, on_threads);
   o["Max Threads per Split Point"] = UCIOption(5, 4, 8, on_threads);
-  o["Threads"]                     = UCIOption(cpus, 1, MAX_THREADS);
+  o["Threads"]                     = UCIOption(cpus, 1, MAX_THREADS, on_threads);
   o["Use Sleeping Threads"]        = UCIOption(true, on_threads);
   o["Hash"]                        = UCIOption(32, 4, 8192, on_hash_size);
   o["Clear Hash"]                  = UCIOption(on_clear_hash);
@@ -138,14 +138,14 @@ void UCIOption::operator=(const string& v) {
 
   assert(!type.empty());
 
-  if (   (type == "button" || !v.empty())
-      && (type != "check"  || (v == "true" || v == "false"))
-      && (type != "spin"   || (atoi(v.c_str()) >= min && atoi(v.c_str()) <= max)))
-  {
-      if (type != "button")
-          currentValue = v;
+  if (   (type != "button" && v.empty())
+      || (type == "check" && v != "true" && v != "false")
+      || (type == "spin" && (atoi(v.c_str()) < min || atoi(v.c_str()) > max)))
+      return;
 
-      if (on_change)
-          (*on_change)(*this);
-  }
+  if (type != "button")
+      currentValue = v;
+
+  if (on_change)
+      (*on_change)(*this);
 }