Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Fix for compilation issue with boost 1.48+ on Mac #57

Merged
merged 1 commit into from

2 participants

@sylvain-chevalier

This is a fix for a an issue when compiling on Mac with boost 1.48+. There is a conflict between a macro defined both in boost and AssertMacros.h. There are several ways to solve the issue but we prefer this one because it also works when using a SDK older than 10.6. This issue and possible ways to fix it are explained in this thread:

http://stackoverflow.com/questions/8173620/c-boost-1-48-type-traits-and-cocoa-inclusion-weirdness

If you think this is acceptable, you might want to merge it in the master branch as well.

Sylvain Chevalier Fix for a conflict between boost and AssertMacros.h on mac which prev…
…ented compilation with boost 1.48 and 1.49, at least when using version 10.5 of the SDK
9691156
@taxilian taxilian merged commit 6d39495 into from
@taxilian
Owner

Sorry that this took so long to get to. I've been swamped.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Apr 18, 2012
  1. Fix for a conflict between boost and AssertMacros.h on mac which prev…

    Sylvain Chevalier authored
    …ented compilation with boost 1.48 and 1.49, at least when using version 10.5 of the SDK
This page is out of date. Refresh to see the latest.
Showing with 6 additions and 0 deletions.
  1. +6 −0 src/ScriptingCore/Util/meta_util_impl.h
View
6 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>
Something went wrong with that request. Please try again.