# HG changeset patch # User bjarni # Date 1168523275 0 # Node ID f9ea8ede273fbd7806e79409b44ec96566dfab20 # Parent 4629f14fe5434495144f628c780ee9752d0b23be (svn r8061) -Fix r8055: obj-c can't handle templates We will need to figure out a nicer solution for this, but now OSX compiles again diff -r 4629f14fe543 -r f9ea8ede273f src/macros.h --- a/src/macros.h Thu Jan 11 12:47:42 2007 +0000 +++ b/src/macros.h Thu Jan 11 13:47:55 2007 +0000 @@ -20,11 +20,14 @@ #undef max #endif +/* Objective C don't like templates */ +#ifdef __cplusplus template 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; }