Fix some warnings and a compile error with icc

[stockfish] / src / ucioption.cpp

diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index ab8137c4492b99a26508ef3eed2e4caa76313609..97cbe1a64684da2cddbcc86561bd19a7c1ff6063 100644 (file)
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -81,10 +81,6 @@ void init_uci_options() {
   Options["Cowardice"] = Option(100, 0, 200);
   Options["Check Extension (PV nodes)"] = Option(2, 0, 2);
   Options["Check Extension (non-PV nodes)"] = Option(1, 0, 2);
-  Options["Single Evasion Extension (PV nodes)"] = Option(2, 0, 2);
-  Options["Single Evasion Extension (non-PV nodes)"] = Option(2, 0, 2);
-  Options["Mate Threat Extension (PV nodes)"] = Option(2, 0, 2);
-  Options["Mate Threat Extension (non-PV nodes)"] = Option(2, 0, 2);
   Options["Pawn Push to 7th Extension (PV nodes)"] = Option(1, 0, 2);
   Options["Pawn Push to 7th Extension (non-PV nodes)"] = Option(1, 0, 2);
   Options["Passed Pawn Extension (PV nodes)"] = Option(1, 0, 2);
@@ -100,6 +96,7 @@ void init_uci_options() {
   Options["Ponder"] = Option(true);
   Options["OwnBook"] = Option(true);
   Options["MultiPV"] = Option(1, 1, 500);
+  Options["Skill level"] = Option(20, 0, 20);
   Options["Emergency Move Horizon"] = Option(40, 0, 50);
   Options["Emergency Base Time"] = Option(200, 0, 30000);
   Options["Emergency Move Time"] = Option(70, 0, 5000);
@@ -160,23 +157,23 @@ Option::Option(int def, int minv, int maxv) : type("spin"), idx(Options.size()),
 /// the GUI to check for option's limits, but we could receive the new value
 /// directly from the user by teminal window. So let's check the bounds anyway.
 
-void Option::set_value(const string& value) {
+void Option::set_value(const string& v) {
 
   assert(!type.empty());
 
-  if (value.empty())
+  if (v.empty())
       return;
 
   if (   (type == "check" || type == "button")
-      != (value == "true" || value == "false"))
+      != (v == "true" || v == "false"))
       return;
 
   if (type == "spin")
   {
-      int v = atoi(value.c_str());
-      if (v < minValue || v > maxValue)
+      int val = atoi(v.c_str());
+      if (val < minValue || val > maxValue)
           return;
   }
 
-  currentValue = value;
+  currentValue = v;
 }