diff options
author | celestar <celestar@openttd.org> | 2007-01-11 12:38:04 +0000 |
---|---|---|
committer | celestar <celestar@openttd.org> | 2007-01-11 12:38:04 +0000 |
commit | e12cf8503d52cb62b1d142d42c34d51af1721ed8 (patch) | |
tree | 32d89087427133254d44e25f29ff72374ff86dcb | |
parent | c56ee62ade0bf539e0ed5e91e2b1e3f0a9b8ec23 (diff) | |
download | openttd-e12cf8503d52cb62b1d142d42c34d51af1721ed8.tar.xz |
(svn r8057) -Codechange: Declare the "new" max template as static line.
-rw-r--r-- | src/macros.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/macros.h b/src/macros.h index 63d59eb72..9c73f38f3 100644 --- a/src/macros.h +++ b/src/macros.h @@ -20,7 +20,11 @@ #undef max #endif -template <typename T> T max(T a, T b) { return a >= b ? a : b; } +template <typename T> +static inline 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; } |