summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx/hugin/files/hugin-2011.4.0-boost148.patch')
-rw-r--r--media-gfx/hugin/files/hugin-2011.4.0-boost148.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/media-gfx/hugin/files/hugin-2011.4.0-boost148.patch b/media-gfx/hugin/files/hugin-2011.4.0-boost148.patch
new file mode 100644
index 000000000000..3c19cc79c303
--- /dev/null
+++ b/media-gfx/hugin/files/hugin-2011.4.0-boost148.patch
@@ -0,0 +1,42 @@
+
+# HG changeset patch
+# User tmodes
+# Date 1324625694 -3600
+# Node ID 7f0674a26bdb85fbcc73f64c8a38d1b353910af7
+# Parent b873e1da31f0fdc4cf19f9630450d1735a040fbe
+Add namespace to compile with Boost 1.48
+
+diff -r b873e1da31f0 -r 7f0674a26bdb src/hugin_base/algorithms/optimizer/ImageGraph.cpp
+--- a/src/hugin_base/algorithms/optimizer/ImageGraph.cpp Fri Dec 23 08:34:18 2011 +0100
++++ b/src/hugin_base/algorithms/optimizer/ImageGraph.cpp Fri Dec 23 08:34:54 2011 +0100
+@@ -55,7 +55,7 @@
+
+ CPGraphIndexMap index = get(boost::vertex_index, graph);
+ bool found=false;
+- for (tie(ai, ai_end) = adjacent_vertices(it->image1Nr, graph);
++ for (boost::tuples::tie(ai, ai_end) = adjacent_vertices(it->image1Nr, graph);
+ ai != ai_end; ++ai)
+ {
+ if (index[*ai] == it->image2Nr) found = true;
+@@ -83,7 +83,7 @@
+
+ CPGraphIndexMap index = get(boost::vertex_index, graph);
+ bool found=false;
+- for (tie(ai, ai_end) = adjacent_vertices(i, graph);
++ for (boost::tuples::tie(ai, ai_end) = adjacent_vertices(i, graph);
+ ai != ai_end; ++ai)
+ {
+ if (index[*ai] == j) found = true;
+diff -r b873e1da31f0 -r 7f0674a26bdb src/hugin_base/algorithms/optimizer/PTOptimizer.h
+--- a/src/hugin_base/algorithms/optimizer/PTOptimizer.h Fri Dec 23 08:34:18 2011 +0100
++++ b/src/hugin_base/algorithms/optimizer/PTOptimizer.h Fri Dec 23 08:34:54 2011 +0100
+@@ -233,7 +233,7 @@
+ // collect all optimized neighbours
+ typename boost::graph_traits<CPGraph>::adjacency_iterator ai;
+ typename boost::graph_traits<CPGraph>::adjacency_iterator ai_end;
+- for (tie(ai, ai_end) = adjacent_vertices(v, g);
++ for (boost::tuples::tie(ai, ai_end) = adjacent_vertices(v, g);
+ ai != ai_end; ++ai)
+ {
+ if (*ai != v) {
+