fix building with boost >= 1.49

diff --git a/ParaView-3.12.0-boost-1.48.0-bfs.patch b/ParaView-3.12.0-boost-1.48.0-bfs.patch
index 5cc2217e9939245292795cba658cddb82f6b45a5..43b4ea80d0db2608ee2c55d5231d46bf88117af5 100644 (file)
--- a/ParaView-3.12.0-boost-1.48.0-bfs.patch
+++ b/ParaView-3.12.0-boost-1.48.0-bfs.patch
@@ -1,29 +1,40 @@
 diff -up ParaView-3.12.0/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx\~ ParaView-3.12.0/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx
 --- ParaView-3.12.0/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx~    2011-11-08 21:56:37.000000000 +0100
 +++ ParaView-3.12.0/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx     2011-12-06 01:11:42.487760688 +0100
-@@ -47,6 +47,15 @@ using namespace boost;
+@@ -47,6 +47,23 @@ using namespace boost;
  vtkStandardNewMacro(vtkBoostBreadthFirstSearchTree);
  
  
++#if BOOST_VERSION >= 104800      // Boost 1.48.x
 +namespace {
-+  vtkIdType unwrap_edge_id(vtkEdgeType const &e) {
++  vtkIdType unwrap_edge_id(vtkEdgeType const &e)
++  {
 +    return e.Id;
 +  }
-+  vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) {
++  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 +104,8 @@ public:
+@@ -95,7 +112,12 @@ 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);
++#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);
++                                  unwrap_edge_id(e), tree_e.Id);
++#endif
    }
  
  private:

diff --git a/ParaView.spec b/ParaView.spec
index 92f87e6e8e7b256b3fb43682f2fae6271d8ffd21..926d0495ebfdcdd1b296270cf63f92c701029bed 100644 (file)
--- a/ParaView.spec
+++ b/ParaView.spec
@@ -80,8 +80,7 @@ developing applications that use %{name}.
 %prep
 %setup -q
 %patch0 -p1
-# We don't have boot 1.48 yet
-#%patch1 -p1
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 #Remove included hdf5 just to be sure