Cleanup Position::to_fen()

[stockfish] / src / square.h

diff --git a/src/square.h b/src/square.h
index 4f024c961df33b8c3c40caed7617b1b14196ccf9..aa3585c11d3d80659770899bb324c3dd8b3545fa 100644 (file)
--- a/src/square.h
+++ b/src/square.h
@@ -1,7 +1,7 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008 Marco Costalba
+  Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -164,7 +164,7 @@ inline File file_from_char(char c) {
 }
 
 inline char file_to_char(File f) {
-  return char(f - FILE_A) + 'a';
+  return char(f - FILE_A + int('a'));
 }
 
 inline Rank rank_from_char(char c) {
@@ -172,7 +172,7 @@ inline Rank rank_from_char(char c) {
 }
 
 inline char rank_to_char(Rank r) {
-  return char(r - RANK_1) + '1';
+  return char(r - RANK_1 + int('1'));
 }
 
 inline Square square_from_string(const std::string& str) {
@@ -180,10 +180,8 @@ inline Square square_from_string(const std::string& str) {
 }
 
 inline const std::string square_to_string(Square s) {
-  std::string str;
-  str += file_to_char(square_file(s));
-  str += rank_to_char(square_rank(s));
-  return str;
+  return  std::string(1, file_to_char(square_file(s)))
+        + std::string(1, rank_to_char(square_rank(s)));
 }
 
 inline bool file_is_ok(File f) {