diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2019-10-16 11:36:01 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2019-10-16 11:36:01 +0300 |
commit | c2fbe46b0f0fde44b8a40d89601a195da27d28fb (patch) | |
tree | f66e3e50758acb36001e2774c6e4ede5fc8bead6 /extern/quadriflow/src/config.hpp | |
parent | 386ba094988fc793f8e060d15438566e5e2d2cae (diff) | |
parent | dcf57e34f3866bba5ddd9cfdfe858a1a5eedc4c2 (diff) |
Merge branch 'master' into temp-gpencil-drw-enginetemp-gpencil-drw-engine
Diffstat (limited to 'extern/quadriflow/src/config.hpp')
-rw-r--r-- | extern/quadriflow/src/config.hpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/extern/quadriflow/src/config.hpp b/extern/quadriflow/src/config.hpp index 842b885a209..bf597ad0f39 100644 --- a/extern/quadriflow/src/config.hpp +++ b/extern/quadriflow/src/config.hpp @@ -1,6 +1,11 @@ #ifndef CONFIG_H_ #define CONFIG_H_ +/* Workaround a bug in boost 1.68, until we upgrade to a newer version. */ +#if defined(__clang__) && defined(WIN32) + #include <boost/type_traits/is_assignable.hpp> + using namespace boost; +#endif // Move settings to cmake to make CMake happy :) // #define WITH_SCALE |