(svn r26651) -Fix: make sure an abs is used that supports int64 when using abs on those variables

2014-06-17 19:01:45 +00:00
parent 37b1d36fb8
commit ab964a6cee
3 changed files with 16 additions and 12 deletions
--- a/src/core/math_func.hpp
+++ b/src/core/math_func.hpp
@@ -12,18 +12,6 @@
 #ifndef MATH_FUNC_HPP
 #define MATH_FUNC_HPP

-#ifdef min
-#undef min
-#endif
-
-#ifdef max
-#undef max
-#endif
-
-#ifdef abs
-#undef abs
-#endif
-
 /**
 * Returns the maximum of two values.
 *
--- a/src/core/overflowsafe_type.hpp
+++ b/src/core/overflowsafe_type.hpp
@@ -12,6 +12,7 @@
 #ifndef OVERFLOWSAFE_TYPE_HPP
 #define OVERFLOWSAFE_TYPE_HPP

+#include "math_func.hpp"

 /**
 * Overflow safe template for integers, i.e. integers that will never overflow