[ViewVC] Diff of: cvs/deliantra/server/include/util.h

Comparing deliantra/server/include/util.h (file contents):
Revision 1.61 by root, Fri Jan 25 18:09:23 2008 UTC vs.
Revision 1.63 by root, Sat Mar 15 13:52:38 2008 UTC

 #ifndef UTIL_H__
 #define UTIL_H__
 //#define PREFER_MALLOC
-//#define DEBUG_SALLOC
+#define DEBUG_SALLOC
 #if __GNUC__ >= 3
 # define is_constant(c)             __builtin_constant_p (c)
 # define expect(expr,value)         __builtin_expect ((expr),(value))
 # define prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
 template<typename T, typename U> static inline T min (T a, U b) { return (U)a < b ? (U)a : b; }
 template<typename T, typename U> static inline T max (T a, U b) { return (U)a > b ? (U)a : b; }
 template<typename T, typename U, typename V> static inline T clamp (T v, U a, V b) { return v < (T)a ? (T)a : v >(T)b ? (T)b : v; }
 template<typename T, typename U> static inline void swap (T& a, U& b) { T t=a; a=(T)b; b=(U)t; }
+template<typename T, typename U, typename V> static inline T min (T a, U b, V c) { return min (a, min (b, c)); }
+template<typename T, typename U, typename V> static inline T max (T a, U b, V c) { return max (a, max (b, c)); }
 template<typename T>
 static inline T
 lerp (T val, T min_in, T max_in, T min_out, T max_out)
 {

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines