Merge pull request #57 from sylvain-chevalier/firebreath-1.6

Fix for compilation issue with boost 1.48+ on Mac
firebreath · May 3, 2012 · 6d39495 · 6d39495
2 parents 0da59d6 + 9691156
commit 6d39495
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/ScriptingCore/Util/meta_util_impl.h b/src/ScriptingCore/Util/meta_util_impl.h
@@ -17,6 +17,12 @@ Copyright 2009 Georg Fritzsche, Firebreath development team
 #define H_META_UTIL_IMPL_22122009
 
 #include <utility>
+
+//Workaround for conflict between boost 1.48+ and Apple's AssertMacros.h
+#ifdef check
+#undef check
+#endif
+
 #include <boost/utility/enable_if.hpp>
 #include <boost/mpl/equal_to.hpp>
 #include <boost/mpl/vector.hpp>