Changeset 3214 for code/trunk/src/util/Math.h

Timestamp:

Jun 23, 2009, 6:02:25 PM (16 years ago)

Author:

scheusso

Message:

merged netp5 back to trunk

File:

• code/trunk/src/util/Math.h (modified) (1 diff)

code/trunk/src/util/Math.h

@@ -47 +47 @@
 #include <OgreColourValue.h>
 
-// Certain headers might define min and max macros
-#if defined(max) || defined(min) || defined(sgn) || defined(clamp) || defined(square) || defined(mod)
-#  error An inline math function was overridden by a macro
-#endif
+// Certain headers might define unwanted macros...
+#undef max
+#undef min
+#undef sgn
+#undef clamp
+#undef sqrt
+#undef square
+#undef mod
+#undef rnd
 
 namespace orxonox