X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftypes.h;h=26de44e12ea5b9a726d7d449b998ce39728bab61;hb=97015afce834a68be4a955768caab7152834d7d8;hp=4e5de7f72f71214aa63c6616b960c7cd18464c58;hpb=0915f85895733ff8ed8e480fa9c83c25c296ea1d;p=stockfish diff --git a/src/types.h b/src/types.h index 4e5de7f7..26de44e1 100644 --- a/src/types.h +++ b/src/types.h @@ -88,7 +88,7 @@ const bool Is64Bit = false; typedef uint64_t Key; typedef uint64_t Bitboard; -const int MAX_MOVES = 192; +const int MAX_MOVES = 256; const int MAX_PLY = 100; const int MAX_PLY_PLUS_6 = MAX_PLY + 6; @@ -274,15 +274,15 @@ inline T operator-(const T d1, const T d2) { return T(int(d1) - int(d2)); } \ inline T operator*(int i, const T d) { return T(i * int(d)); } \ inline T operator*(const T d, int i) { return T(int(d) * i); } \ inline T operator-(const T d) { return T(-int(d)); } \ -inline T& operator+=(T& d1, const T d2) { d1 = d1 + d2; return d1; } \ -inline T& operator-=(T& d1, const T d2) { d1 = d1 - d2; return d1; } \ -inline T& operator*=(T& d, int i) { d = T(int(d) * i); return d; } +inline T& operator+=(T& d1, const T d2) { return d1 = d1 + d2; } \ +inline T& operator-=(T& d1, const T d2) { return d1 = d1 - d2; } \ +inline T& operator*=(T& d, int i) { return d = T(int(d) * i); } #define ENABLE_OPERATORS_ON(T) ENABLE_SAFE_OPERATORS_ON(T) \ -inline T operator++(T& d, int) { d = T(int(d) + 1); return d; } \ -inline T operator--(T& d, int) { d = T(int(d) - 1); return d; } \ +inline T& operator++(T& d) { return d = T(int(d) + 1); } \ +inline T& operator--(T& d) { return d = T(int(d) - 1); } \ inline T operator/(const T d, int i) { return T(int(d) / i); } \ -inline T& operator/=(T& d, int i) { d = T(int(d) / i); return d; } +inline T& operator/=(T& d, int i) { return d = T(int(d) / i); } ENABLE_OPERATORS_ON(Value) ENABLE_OPERATORS_ON(PieceType) @@ -323,11 +323,11 @@ inline bool operator<(const ExtMove& f, const ExtMove& s) { } inline Color operator~(Color c) { - return Color(c ^ 1); + return Color(c ^ BLACK); } inline Square operator~(Square s) { - return Square(s ^ 56); // Vertical flip SQ_A1 -> SQ_A8 + return Square(s ^ SQ_A8); // Vertical flip SQ_A1 -> SQ_A8 } inline Square operator|(File f, Rank r) {