X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftypes.h;h=8e6356eb344f4d94b23323633014bb258dfecb00;hp=226d76e44d63a3607a8c2e45452871522c2e0460;hb=efeb37c33f15a903dbe5706529a7a26511e9ca58;hpb=94b9c65e09b5d396bebb29b62d9979139b5fbdfa

diff --git a/src/types.h b/src/types.h
index 226d76e4..8e6356eb 100644
--- a/src/types.h
+++ b/src/types.h
@@ -17,7 +17,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #if !defined(TYPES_H_INCLUDED)
 #define TYPES_H_INCLUDED
 
@@ -27,6 +26,10 @@
 
 #else
 
+// Disable some silly and noisy warning from MSVC compiler
+#pragma warning(disable: 4800) // Forcing value to bool 'true' or 'false'
+#pragma warning(disable: 4127) // Conditional expression is constant
+
 typedef __int8 int8_t;
 typedef unsigned __int8 uint8_t;
 typedef __int16 int16;
@@ -47,6 +50,7 @@ typedef uint64_t Key;
 // Bitboard type
 typedef uint64_t Bitboard;
 
+#include <cstdlib>
 
 ////
 //// Configuration
@@ -112,43 +116,61 @@ inline void __cpuid(int CPUInfo[4], int)
 
 // Templetized operators used by enum types like Depth, Piece, Square and so on.
 // We don't want to write the same inline for each different enum. Note that we
-// pass by value (to silence scaring warnings on volatiles), so you really should
-// use only enum types with these functions to avoid hidden copies.
+// pass by value to silence scaring warnings when using volatiles.
+// Because these templates override common operators and are included in all the
+// files, there is a possibility that the compiler silently performs some unwanted
+// overrides. To avoid possible very nasty bugs the templates are disabled by default
+// and must be enabled for each type on a case by case base. The enabling trick
+// uses template specialization, namely we just declare following struct.
+template<typename T> struct TempletizedOperator;
+
+// Then to enable the enum type we use following macro that defines a specialization
+// of TempletizedOperator for the given enum T. Here is defined typedef Not_Enabled.
+// Name of typedef is chosen to produce somewhat informative compile error messages.
+#define ENABLE_OPERATORS_ON(T)  \
+        template<> struct TempletizedOperator<T> { typedef T Not_Enabled; }
+
+// Finally we use macro OK(T) to check if type T is enabled. The macro simply
+// tries to use Not_Enabled, if was not previously defined a compile error occurs.
+// The check is done fully at compile time and there is zero overhead at runtime.
+#define OK(T) typedef typename TempletizedOperator<T>::Not_Enabled Type
 
 template<typename T>
-inline T operator+ (const T d1, const T d2) { return T(int(d1) + int(d2)); }
+inline T operator+ (const T d1, const T d2) { OK(T); return T(int(d1) + int(d2)); }
 
 template<typename T>
-inline T operator- (const T d1, const T d2) { return T(int(d1) - int(d2)); }
+inline T operator- (const T d1, const T d2) { OK(T); return T(int(d1) - int(d2)); }
 
 template<typename T>
-inline T operator* (int i, const T d) { return T(i * int(d)); }
+inline T operator* (int i, const T d) { OK(T); return T(i * int(d)); }
 
 template<typename T>
-inline T operator* (const T d, int i) { return T(int(d) * i); }
+inline T operator* (const T d, int i) { OK(T); return T(int(d) * i); }
 
 template<typename T>
-inline T operator/ (const T d, int i) { return T(int(d) / i); }
+inline T operator/ (const T d, int i) { OK(T); return T(int(d) / i); }
 
 template<typename T>
-inline T operator- (const T d) { return T(-int(d)); }
+inline T operator- (const T d) { OK(T); return T(-int(d)); }
 
 template<typename T>
-inline void operator++ (T& d, int) { d = T(int(d) + 1); }
+inline T operator++ (T& d, int) { OK(T); d = T(int(d) + 1); return d; }
 
 template<typename T>
-inline void operator-- (T& d, int) { d = T(int(d) - 1); }
+inline T operator-- (T& d, int) { OK(T); d = T(int(d) - 1); return d; }
 
 template<typename T>
-inline void operator+= (T& d1, const T d2) { d1 = d1 + d2; }
+inline void operator+= (T& d1, const T d2) { OK(T); d1 = d1 + d2; }
 
 template<typename T>
-inline void operator-= (T& d1, const T d2) { d1 = d1 - d2; }
+inline void operator-= (T& d1, const T d2) { OK(T); d1 = d1 - d2; }
 
 template<typename T>
-inline void operator*= (T& d, int i) { d = T(int(d) * i); }
+inline void operator*= (T& d, int i) { OK(T); d = T(int(d) * i); }
 
 template<typename T>
-inline void operator/= (T& d, int i) { d = T(int(d) / i); }
+inline void operator/= (T& d, int i) { OK(T); d = T(int(d) / i); }
+
+#undef OK
 
 #endif // !defined(TYPES_H_INCLUDED)