summaryrefslogtreecommitdiff
path: root/src/macros.h
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2007-02-19 21:11:44 +0000
committerrubidium <rubidium@openttd.org>2007-02-19 21:11:44 +0000
commitee3d28ff8f304e979ad274c5319942409b6e5cad (patch)
tree535f4bea06817bca1ec76a8f2534ca3e36f51386 /src/macros.h
parent3b9a8d6201ef3dcff4e3133dad58abe49f1e9228 (diff)
downloadopenttd-ee3d28ff8f304e979ad274c5319942409b6e5cad.tar.xz
(svn r8818) -Codechange: remove the #ifdef _cplusplus remnants.
Diffstat (limited to 'src/macros.h')
-rw-r--r--src/macros.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/macros.h b/src/macros.h
index 56dc219e3..a16d4ddb3 100644
--- a/src/macros.h
+++ b/src/macros.h
@@ -18,14 +18,11 @@
#undef max
#endif
-/* Objective C don't like templates */
-#ifdef __cplusplus
template <typename T>
static inline T max(T a, T b)
{
return a >= b ? a : b;
}
-#endif
static inline int min(int a, int b) { if (a <= b) return a; return b; }