diff options
| author | Alexander Pinzon Fernandez <apinzonf@gmail.com> | 2013-12-11 20:10:22 +0400 |
|---|---|---|
| committer | Alexander Pinzon Fernandez <apinzonf@gmail.com> | 2013-12-11 20:10:22 +0400 |
| commit | 2658a3c1b44717f497f187a38000c804eb37bbba (patch) | |
| tree | ee55c673feabced8b6ec8bf9a8aa4d82a3cda3db /extern/carve/patches/clang_is_heap_fix.patch | |
| parent | 4005cb1c6a63a217df0e887c741beee2c1359301 (diff) | |
| parent | 09b859d03f0ee138c4273ef8460e91d9888387a1 (diff) | |
Merge branch 'master' into soc-2013-sketch_meshsoc-2013-sketch_mesh
Conflicts:
release/scripts/addons
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/object/object_modifier.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/intern/MOD_laplaciandeform.c
Diffstat (limited to 'extern/carve/patches/clang_is_heap_fix.patch')
| -rw-r--r-- | extern/carve/patches/clang_is_heap_fix.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/extern/carve/patches/clang_is_heap_fix.patch b/extern/carve/patches/clang_is_heap_fix.patch new file mode 100644 index 00000000000..435e408d6cd --- /dev/null +++ b/extern/carve/patches/clang_is_heap_fix.patch @@ -0,0 +1,17 @@ +diff -r 2e6e59022e6e lib/triangulator.cpp +--- a/lib/triangulator.cpp Fri Nov 09 09:35:35 2012 +1100 ++++ b/lib/triangulator.cpp Thu Nov 28 13:34:52 2013 +0600 +@@ -27,6 +27,13 @@ + + #include <algorithm> + ++// Support for latest Clang/LLVM on FreeBSD which does have different libcxx. ++// ++// TODO(sergey): Move it some some more generic header with platform-specific ++// declarations. ++#ifdef _LIBCPP_VERSION ++# define __is_heap is_heap ++#endif + + namespace { + // private code related to hole patching. |