X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpiece.cpp;h=84ed22d78dd47740fcffa34a0d51620f748a7c0b;hp=707c8c57dfae3d53ae3de96d44de1a40d53e91f4;hb=fb560fa5d77297f8deaa5c7375059e2ea9c36cd0;hpb=f0858cd22972c0f893ab8d012a0f1783cd9faff2

diff --git a/src/piece.cpp b/src/piece.cpp
index 707c8c57..84ed22d7 100644
--- a/src/piece.cpp
+++ b/src/piece.cpp
@@ -22,10 +22,11 @@
 //// Includes
 ////
 
-#include <cstring>
+#include <string>
 
 #include "piece.h"
 
+using namespace std;
 
 ////
 //// Functions
@@ -33,13 +34,16 @@
 
 /// Translating piece types to/from English piece letters
 
-static const char PieceChars[] = " pnbrqk";
+static const string PieceChars(" pnbrqk PNBRQK");
 
 char piece_type_to_char(PieceType pt, bool upcase) {
-  return upcase? toupper(PieceChars[pt]) : PieceChars[pt];
+
+  return PieceChars[pt + upcase * 7];
 }
 
 PieceType piece_type_from_char(char c) {
-  const char* ch = strchr(PieceChars, tolower(c));
-  return ch? PieceType(ch - PieceChars) : NO_PIECE_TYPE;
+
+  size_t idx = PieceChars.find(c);
+
+  return idx != string::npos ? PieceType(idx % 7) : NO_PIECE_TYPE;
 }