diff options
author | celestar <celestar@openttd.org> | 2007-01-11 11:05:01 +0000 |
---|---|---|
committer | celestar <celestar@openttd.org> | 2007-01-11 11:05:01 +0000 |
commit | 2ac0410767683fb0e6315433f9805712cb85f5bd (patch) | |
tree | f9cb6bcd0d0b855706d1e00e0a4ffd2757c7e039 /src/macros.h | |
parent | 7996c9e560f61cddba0a3ad48b95c81d9030ef99 (diff) | |
download | openttd-2ac0410767683fb0e6315433f9805712cb85f5bd.tar.xz |
(svn r8055) -Codechange: Replace the different max, dmax, maxu whatever macros by a simple template function max(), that requires two arguments of the same type. While I'm at it change a variable called "max" to "maxval" in a function that calls max().
Diffstat (limited to 'src/macros.h')
-rw-r--r-- | src/macros.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/macros.h b/src/macros.h index 644f178af..07011f14c 100644 --- a/src/macros.h +++ b/src/macros.h @@ -20,13 +20,11 @@ #undef max #endif -static inline int max(int a, int b) { if (a >= b) return a; return b; } -static inline double dmax(double a, double b) { if (a >= b) return a; return b; } -static inline uint64 max64(uint64 a, uint64 b) { if (a >= b) return a; return b; } +template <typename T> T max(T a, T b) { return a >= b ? a : b; } + static inline int min(int a, int b) { if (a <= b) return a; return b; } static inline uint minu(uint a, uint b) { if (a <= b) return a; return b; } -static inline uint maxu(uint a, uint b) { if (a >= b) return a; return b; } static inline int clamp(int a, int min, int max) |