X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftypes.h;h=99567bd7e22a608de7ca91a16d81058112661624;hp=d4ebec9f06fe977fa0d5df482fecab850af063f3;hb=22c557ca7ce957cfb164c56dd149f22e2f11c7f9;hpb=e40b06a0503b44bae5508a371d961914828214b6

diff --git a/src/types.h b/src/types.h
index d4ebec9f..99567bd7 100644
--- a/src/types.h
+++ b/src/types.h
@@ -35,6 +35,7 @@
 ///               | only in 64-bit mode. For compiling requires hardware with
 ///               | popcnt support.
 
+#include <cassert>
 #include <cctype>
 #include <climits>
 #include <cstdlib>
@@ -391,7 +392,8 @@ inline PieceType type_of(Piece p)  {
 }
 
 inline Color color_of(Piece p) {
-  return p == NO_PIECE ? NO_COLOR : Color(p >> 3);
+  assert(p != NO_PIECE);
+  return Color(p >> 3);
 }
 
 inline bool is_ok(Square s) {
@@ -440,11 +442,11 @@ inline int square_distance(Square s1, Square s2) {
 }
 
 inline char file_to_char(File f) {
-  return char(f - FILE_A + int('a'));
+  return char(f - FILE_A + 'a');
 }
 
 inline char rank_to_char(Rank r) {
-  return char(r - RANK_1 + int('1'));
+  return char(r - RANK_1 + '1');
 }
 
 inline Square pawn_push(Color c) {
@@ -490,15 +492,15 @@ inline const std::string square_to_string(Square s) {
 /// Our insertion sort implementation, works with pointers and iterators and is
 /// guaranteed to be stable, as is needed.
 template<typename T, typename K>
-void sort(K first, K last)
+void sort(K begin, K end)
 {
   T tmp;
   K p, q;
 
-  for (p = first + 1; p < last; p++)
+  for (p = begin + 1; p < end; p++)
   {
       tmp = *p;
-      for (q = p; q != first && *(q-1) < tmp; --q)
+      for (q = p; q != begin && *(q-1) < tmp; --q)
           *q = *(q-1);
       *q = tmp;
   }