Skip to content
Snippets Groups Projects
Commit 5f051b98 authored by Marcus D. Hanwell's avatar Marcus D. Hanwell
Browse files

COMP: Added ifdefs for Boost versions

The dashboards have spoken, ifdefs are needed to acocunt for the change
in API. This should hopefully get everything working again.

Change-Id: I4f1390ccd9f88a734bd1a8f9d72d85954b2b98ed
parent d3ecc2c4
No related branches found
No related tags found
No related merge requests found
......@@ -47,6 +47,7 @@ using namespace boost;
vtkStandardNewMacro(vtkBoostBreadthFirstSearchTree);
#if BOOST_VERSION >= 104800 // Boost 1.48.x
namespace {
vtkIdType unwrap_edge_id(vtkEdgeType const &e) {
return e.Id;
......@@ -55,6 +56,7 @@ namespace {
return e.underlying_desc.Id;
}
}
#endif
// Redefine the bfs visitor, the only visitor we
// are using is the tree_edge visitor.
......@@ -104,8 +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:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment