diff options
Diffstat (limited to 'extern/carve/patches/clang_is_heap_fix.patch')
-rw-r--r-- | extern/carve/patches/clang_is_heap_fix.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/extern/carve/patches/clang_is_heap_fix.patch b/extern/carve/patches/clang_is_heap_fix.patch deleted file mode 100644 index 524a8e0420c..00000000000 --- a/extern/carve/patches/clang_is_heap_fix.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -r e82d852e4fb0 include/carve/mesh_ops.hpp ---- a/include/carve/mesh_ops.hpp Wed Jan 15 13:16:14 2014 +1100 -+++ b/include/carve/mesh_ops.hpp Fri Mar 28 14:34:04 2014 +0600 -@@ -580,7 +580,7 @@ - std::vector<VertexInfo *> queue; - - void checkheap() { --#ifdef __GNUC__ -+#if defined(HAVE_IS_HEAP) - CARVE_ASSERT(std::__is_heap(queue.begin(), queue.end(), order_by_score())); - #endif - } -diff -r e82d852e4fb0 lib/triangulator.cpp ---- a/lib/triangulator.cpp Wed Jan 15 13:16:14 2014 +1100 -+++ b/lib/triangulator.cpp Fri Mar 28 14:34:04 2014 +0600 -@@ -27,7 +27,6 @@ - - #include <algorithm> - -- - namespace { - // private code related to hole patching. - -@@ -122,7 +121,7 @@ - std::vector<vertex_info *> queue; - - void checkheap() { --#ifdef __GNUC__ -+#if defined(HAVE_IS_HEAP) - CARVE_ASSERT(std::__is_heap(queue.begin(), queue.end(), vertex_info_ordering())); - #endif - } |