X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fpiece.cpp;h=a9adf57366e7ae5b731718524fa942399d048db5;hb=f57d51b7f3b5d97b7322aa7e4bd9025726a518e3;hp=b287994975cbd5360d8f531758fa82931e4cb96b;hpb=a4a0ffce711962c0b04b35998c3c06491be373bf;p=stockfish

diff --git a/src/piece.cpp b/src/piece.cpp
index b2879949..a9adf573 100644
--- a/src/piece.cpp
+++ b/src/piece.cpp
@@ -17,33 +17,23 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
-////
-//// Includes
-////
-
 #include <string>
 
 #include "piece.h"
 
-using namespace std;
+static const std::string PieceChars(" pnbrqk PNBRQK");
 
-////
-//// Functions
-////
 
 /// Translating piece types to/from English piece letters
 
-static const string PieceChars(" pnbrqk PNBRQK");
-
 char piece_type_to_char(PieceType pt, bool upcase) {
 
-  return PieceChars[pt + int(upcase) * 7];
+  return PieceChars[pt + (upcase ? 7 : 0)];
 }
 
 PieceType piece_type_from_char(char c) {
 
   size_t idx = PieceChars.find(c);
 
-  return idx != string::npos ? PieceType(idx % 7) : NO_PIECE_TYPE;
+  return idx != std::string::npos ? PieceType(idx % 7) : PIECE_TYPE_NONE;
 }