X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=f05a114e51993088df0c20cc2b86dda2bbc5436f;hp=1b91b451f3b62124ae267d28659ec656461f541e;hb=60c121f3b1ee7d5ced3435cc1718e4e6e6fd8383;hpb=42b48b08e81b55e385e55b3074b7c59d81809a45

diff --git a/src/uci.cpp b/src/uci.cpp
index 1b91b451..f05a114e 100644
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -232,9 +232,7 @@ 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) {
-
-  char sq[] = { char('a' + file_of(s)), char('1' + rank_of(s)), 0 }; // NULL terminated
-  return sq;
+  return std::string{ char('a' + file_of(s)), char('1' + rank_of(s)) };
 }
 
 
@@ -274,9 +272,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 (MoveList<LEGAL> it(pos); *it; ++it)
-      if (str == UCI::move(*it, pos.is_chess960()))
-          return *it;
+  for (const ExtMove& ms : MoveList<LEGAL>(pos))
+      if (str == UCI::move(ms.move, pos.is_chess960()))
+          return ms.move;
 
   return MOVE_NONE;
 }