mirror of
https://git.freebsd.org/ports.git
synced 2025-06-14 01:00:33 -04:00
e08dba80e2
- Add LICENSE - Switch to new LIB_DEPENDS format - Enabling staging support - Simplify OPTION knob handling - Unbreak the build on 8.x, 10.x and CURRENT after the update of graphics/opencv and graphics/openshadinglanguage, which require llvm3.3 Supported by: tijl@, Shane Ambler <FreeBSD@ShaneWare.Biz>
14 lines
549 B
C++
14 lines
549 B
C++
--- 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
|
|
}
|
|
|