Revert C++11 merge

[stockfish] / src / ucioption.cpp

diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index c78237641d061a3fa513722f13188d573165bc80..1778c7182a52f56de7209e19a79af8b90cc17feb 100644 (file)
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -19,6 +19,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <cstdlib>
 #include <sstream>
 
 #include "misc.h"
@@ -42,10 +43,10 @@ void on_tb_path(const Option& o) { Tablebases::init(o); }
 
 
 /// Our case insensitive less() function as required by UCI protocol
-bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const {
+bool ci_less(char c1, char c2) { return tolower(c1) < tolower(c2); }
 
-  return std::lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(),
-         [](char c1, char c2) { return tolower(c1) < tolower(c2); });
+bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const {
+  return std::lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(), ci_less);
 }
 
 
@@ -81,11 +82,11 @@ void init(OptionsMap& o) {
 std::ostream& operator<<(std::ostream& os, const OptionsMap& om) {
 
   for (size_t idx = 0; idx < om.size(); ++idx)
-      for (auto& it : om)
-          if (it.second.idx == idx)
+      for (OptionsMap::const_iterator it = om.begin(); it != om.end(); ++it)
+          if (it->second.idx == idx)
           {
-              const Option& o = it.second;
-              os << "\noption name " << it.first << " type " << o.type;
+              const Option& o = it->second;
+              os << "\noption name " << it->first << " type " << o.type;
 
               if (o.type != "button")
                   os << " default " << o.defaultValue;
@@ -95,7 +96,6 @@ std::ostream& operator<<(std::ostream& os, const OptionsMap& om) {
 
               break;
           }
-
   return os;
 }
 
@@ -112,11 +112,12 @@ Option::Option(OnChange f) : type("button"), min(0), max(0), on_change(f)
 {}
 
 Option::Option(int v, int minv, int maxv, OnChange f) : type("spin"), min(minv), max(maxv), on_change(f)
-{ defaultValue = currentValue = std::to_string(v); }
+{ std::ostringstream ss; ss << v; defaultValue = currentValue = ss.str(); }
+
 
 Option::operator int() const {
   assert(type == "check" || type == "spin");
-  return (type == "spin" ? stoi(currentValue) : currentValue == "true");
+  return (type == "spin" ? atoi(currentValue.c_str()) : currentValue == "true");
 }
 
 Option::operator std::string() const {
@@ -146,7 +147,7 @@ Option& Option::operator=(const string& v) {
 
   if (   (type != "button" && v.empty())
       || (type == "check" && v != "true" && v != "false")
-      || (type == "spin" && (stoi(v) < min || stoi(v) > max)))
+      || (type == "spin" && (atoi(v.c_str()) < min || atoi(v.c_str()) > max)))
       return *this;
 
   if (type != "button")