]>
Commit | Line | Data |
---|---|---|
72d81c28 JR |
1 | diff -up ParaView-3.12.0/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx\~ ParaView-3.12.0/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx |
2 | --- ParaView-3.12.0/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx~ 2011-11-08 21:56:37.000000000 +0100 | |
3 | +++ ParaView-3.12.0/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx 2011-12-06 01:11:42.487760688 +0100 | |
4 | @@ -47,6 +47,15 @@ using namespace boost; | |
5 | vtkStandardNewMacro(vtkBoostBreadthFirstSearchTree); | |
6 | ||
7 | ||
8 | +namespace { | |
9 | + vtkIdType unwrap_edge_id(vtkEdgeType const &e) { | |
10 | + return e.Id; | |
11 | + } | |
12 | + vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) { | |
13 | + return e.underlying_desc.Id; | |
14 | + } | |
15 | +} | |
16 | + | |
17 | // Redefine the bfs visitor, the only visitor we | |
18 | // are using is the tree_edge visitor. | |
19 | template <typename IdMap> | |
20 | @@ -95,7 +104,8 @@ public: | |
21 | ||
22 | // Copy the vertex and edge data from the graph to the tree. | |
23 | tree->GetVertexData()->CopyData(graph->GetVertexData(), v, tree_v); | |
24 | - tree->GetEdgeData()->CopyData(graph->GetEdgeData(), e.Id, tree_e.Id); | |
25 | + tree->GetEdgeData()->CopyData(graph->GetEdgeData(), | |
26 | + unwrap_edge_id(e), tree_e.Id); | |
27 | } | |
28 | ||
29 | private: | |
30 | ||
31 | Diff finished. Tue Dec 6 01:13:13 2011 |