diff options
Diffstat (limited to 'graphics/blender/files/patch-extern_carve_lib_triangulator.cpp')
| -rw-r--r-- | graphics/blender/files/patch-extern_carve_lib_triangulator.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/graphics/blender/files/patch-extern_carve_lib_triangulator.cpp b/graphics/blender/files/patch-extern_carve_lib_triangulator.cpp new file mode 100644 index 000000000000..378d1e0e2480 --- /dev/null +++ b/graphics/blender/files/patch-extern_carve_lib_triangulator.cpp @@ -0,0 +1,14 @@ +--- extern/carve/lib/triangulator.cpp.orig 2012-01-30 09:45:12.000000000 +0100 ++++ extern/carve/lib/triangulator.cpp 2013-11-13 21:17:16.000000000 +0100 +@@ -122,8 +122,10 @@ + std::vector<vertex_info *> queue; + + void checkheap() { +-#ifdef __GNUC__ ++#if defined(__GNUC__) && !defined(__clang__) + CARVE_ASSERT(std::__is_heap(queue.begin(), queue.end(), vertex_info_ordering())); ++#elif defined(__clang__) && defined(_LIBCPP_VERSION) ++ CARVE_ASSERT(std::is_heap(queue.begin(), queue.end(), vertex_info_ordering())); + #endif + } + |