diff options
Diffstat (limited to 'sci-libs/vtk/files/vtk-5.8.0-boost.patch')
-rw-r--r-- | sci-libs/vtk/files/vtk-5.8.0-boost.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/sci-libs/vtk/files/vtk-5.8.0-boost.patch b/sci-libs/vtk/files/vtk-5.8.0-boost.patch deleted file mode 100644 index 30a0e9a4c606..000000000000 --- a/sci-libs/vtk/files/vtk-5.8.0-boost.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.cxx b/Infovis/vtkBoostBreadthFirstSearchTree.cxx -index c789f6b..13e7cb6 100644 ---- a/Infovis/vtkBoostBreadthFirstSearchTree.cxx -+++ b/Infovis/vtkBoostBreadthFirstSearchTree.cxx -@@ -47,6 +47,21 @@ using namespace boost; - vtkStandardNewMacro(vtkBoostBreadthFirstSearchTree); - - -+#if BOOST_VERSION >= 104800 // Boost 1.48.x -+namespace { -+ vtkIdType unwrap_edge_id(vtkEdgeType const &e) { -+ return e.Id; -+ } -+ vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) { -+# if BOOST_VERSION == 104800 -+ return e.underlying_desc.Id; -+# else -+ return e.underlying_descx.Id; -+# endif -+ } -+} -+#endif -+ - // Redefine the bfs visitor, the only visitor we - // are using is the tree_edge visitor. - template <typename IdMap> -@@ -95,7 +106,12 @@ public: - - // Copy the vertex and edge data from the graph to the tree. - tree->GetVertexData()->CopyData(graph->GetVertexData(), v, tree_v); -+#if BOOST_VERSION < 104800 // Boost 1.48.x - tree->GetEdgeData()->CopyData(graph->GetEdgeData(), e.Id, tree_e.Id); -+#else -+ tree->GetEdgeData()->CopyData(graph->GetEdgeData(), -+ unwrap_edge_id(e), tree_e.Id); -+#endif - } - - private: |