]>
Commit | Line | Data |
---|---|---|
8d833c50 JR |
1 | --- ParaView-3.14.1-Source/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx 2012-04-02 10:57:30.000000000 -0600 |
2 | +++ VTK5.10.1/Infovis/vtkBoostBreadthFirstSearchTree.cxx 2012-10-15 14:33:21.000000000 -0600 | |
3 | @@ -49,11 +49,17 @@ | |
4 | ||
5 | #if BOOST_VERSION >= 104800 // Boost 1.48.x | |
6 | namespace { | |
7 | - vtkIdType unwrap_edge_id(vtkEdgeType const &e) { | |
8 | + vtkIdType unwrap_edge_id(vtkEdgeType const &e) | |
9 | + { | |
10 | return e.Id; | |
11 | } | |
12 | - vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) { | |
13 | + vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) | |
14 | + { | |
15 | +# if BOOST_VERSION == 104800 | |
16 | return e.underlying_desc.Id; | |
17 | +# else | |
18 | + return e.underlying_descx.Id; | |
19 | +# endif | |
20 | } | |
21 | } | |
22 | #endif |