diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-18 21:17:06 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-18 21:17:06 -0300 |
commit | 02ffd41dca71e92f0105e37751e37c7332a9d447 (patch) | |
tree | 149d2e97e51dbab3f8f4dd6e4286dd5c42ba033d /community-staging/vtk/fix-boost-graph-api-changes.diff | |
parent | cc66c2ff866631ece4d699b041f83444988e8ad2 (diff) | |
parent | d8fd24a96ae712b2de3e9b05d937b135f41d016d (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/kadu/PKGBUILD
extra/libgsf/PKGBUILD
libre/linux-libre/PKGBUILD
staging/kdelibs/PKGBUILD
testing/glibc/PKGBUILD
Diffstat (limited to 'community-staging/vtk/fix-boost-graph-api-changes.diff')
-rw-r--r-- | community-staging/vtk/fix-boost-graph-api-changes.diff | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/community-staging/vtk/fix-boost-graph-api-changes.diff b/community-staging/vtk/fix-boost-graph-api-changes.diff new file mode 100644 index 000000000..2162e7a28 --- /dev/null +++ b/community-staging/vtk/fix-boost-graph-api-changes.diff @@ -0,0 +1,42 @@ +commit d3ecc2c459dd1df937fc97887581ace1036da533 +Author: Marcus D. Hanwell <marcus.hanwell@kitware.com> +Date: Tue Dec 13 15:36:06 2011 -0500 + + BUG: 12772 fixes for change in Boost graph API + + This fixes bug 12772, where an API change in Boost was causing + compilation failures using Boost 1.38. Thanks to Orion Poplawski for + reporting the issue and posting the patch. + + Change-Id: I491b0f1650c0be19319533306eb10597dc96fa06 + +diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.cxx b/Infovis/vtkBoostBreadthFirstSearchTree.cxx +index c789f6b..cf7cd47 100644 +--- a/Infovis/vtkBoostBreadthFirstSearchTree.cxx ++++ b/Infovis/vtkBoostBreadthFirstSearchTree.cxx +@@ -47,6 +47,15 @@ using namespace boost; + vtkStandardNewMacro(vtkBoostBreadthFirstSearchTree); + + ++namespace { ++ vtkIdType unwrap_edge_id(vtkEdgeType const &e) { ++ return e.Id; ++ } ++ vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) { ++ return e.underlying_desc.Id; ++ } ++} ++ + // Redefine the bfs visitor, the only visitor we + // are using is the tree_edge visitor. + template <typename IdMap> +@@ -95,7 +104,8 @@ public: + + // Copy the vertex and edge data from the graph to the tree. + tree->GetVertexData()->CopyData(graph->GetVertexData(), v, tree_v); +- tree->GetEdgeData()->CopyData(graph->GetEdgeData(), e.Id, tree_e.Id); ++ tree->GetEdgeData()->CopyData(graph->GetEdgeData(), ++ unwrap_edge_id(e), tree_e.Id); + } + + private: |