Revert C++11 merge

[stockfish] / src / uci.cpp

diff --git a/src/uci.cpp b/src/uci.cpp
index f05a114e51993088df0c20cc2b86dda2bbc5436f..1b91b451f3b62124ae267d28659ec656461f541e 100644 (file)
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -232,7 +232,9 @@ string UCI::value(Value v) {
 /// UCI::square() converts a Square to a string in algebraic notation (g1, a7, etc.)
 
 std::string UCI::square(Square s) {
-  return std::string{ char('a' + file_of(s)), char('1' + rank_of(s)) };
+
+  char sq[] = { char('a' + file_of(s)), char('1' + rank_of(s)), 0 }; // NULL terminated
+  return sq;
 }
 
 
@@ -272,9 +274,9 @@ Move UCI::to_move(const Position& pos, string& str) {
   if (str.length() == 5) // Junior could send promotion piece in uppercase
       str[4] = char(tolower(str[4]));
 
-  for (const ExtMove& ms : MoveList<LEGAL>(pos))
-      if (str == UCI::move(ms.move, pos.is_chess960()))
-          return ms.move;
+  for (MoveList<LEGAL> it(pos); *it; ++it)
+      if (str == UCI::move(*it, pos.is_chess960()))
+          return *it;
 
   return MOVE_NONE;
 }