summaryrefslogtreecommitdiff
path: root/geography/merkaartor/patches/patch-include_builtin-ggl_ggl_algorithms_overlay_get__intersection__points.hpp
diff options
context:
space:
mode:
authorjoerg <joerg>2013-02-26 11:15:18 +0000
committerjoerg <joerg>2013-02-26 11:15:18 +0000
commit103617780708e6ca49ee796bbe81ee7a543d1e46 (patch)
tree1efce5b9569080f5eb5b1d19193e04939c9671e7 /geography/merkaartor/patches/patch-include_builtin-ggl_ggl_algorithms_overlay_get__intersection__points.hpp
parent91f21e7f08d3136f5c84d7f95ca0027c7aedebc9 (diff)
downloadpkgsrc-103617780708e6ca49ee796bbe81ee7a543d1e46.tar.gz
Qt4's MOC can't deal with BOOST_JOIN, so disable some includes before it
sees the boost headers. Use C++11 tuple syntax.
Diffstat (limited to 'geography/merkaartor/patches/patch-include_builtin-ggl_ggl_algorithms_overlay_get__intersection__points.hpp')
-rw-r--r--geography/merkaartor/patches/patch-include_builtin-ggl_ggl_algorithms_overlay_get__intersection__points.hpp15
1 files changed, 15 insertions, 0 deletions
diff --git a/geography/merkaartor/patches/patch-include_builtin-ggl_ggl_algorithms_overlay_get__intersection__points.hpp b/geography/merkaartor/patches/patch-include_builtin-ggl_ggl_algorithms_overlay_get__intersection__points.hpp
new file mode 100644
index 00000000000..a7dcde790d2
--- /dev/null
+++ b/geography/merkaartor/patches/patch-include_builtin-ggl_ggl_algorithms_overlay_get__intersection__points.hpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-include_builtin-ggl_ggl_algorithms_overlay_get__intersection__points.hpp,v 1.1 2013/02/26 11:15:19 joerg Exp $
+
+--- include/builtin-ggl/ggl/algorithms/overlay/get_intersection_points.hpp.orig 2011-02-10 12:00:35.000000000 +0000
++++ include/builtin-ggl/ggl/algorithms/overlay/get_intersection_points.hpp
+@@ -94,8 +94,8 @@ struct relate
+ >
+ >::relate(s1, s2);
+
+- ip_type& is = result.get<0>();
+- policies::relate::direction_type & dir = result.get<1>();
++ ip_type& is = get<0>(result);
++ policies::relate::direction_type & dir = get<1>(result);
+
+ for (int i = 0; i < is.count; i++)
+ {