Welcome to mirror list, hosted at ThFree Co, Russian Federation.

clang_is_heap_fix.patch « patches « carve « extern - git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
blob: 524a8e0420c94e4da0294929c8df279013d15bf5 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
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
     }