(svn r8061) -Fix r8055: obj-c can't handle templates
authorbjarni
Thu, 11 Jan 2007 13:47:55 +0000
changeset 5605 f9ea8ede273f
parent 5604 4629f14fe543
child 5606 0b3fb15cbf8f
(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
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 <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; }