diff options
author | Lukas Böger | 2016-10-07 10:37:25 +0200 |
---|---|---|
committer | Lukas Böger | 2016-10-07 10:37:25 +0200 |
commit | 97db4b9ec0879f0e339861dbbb151eebba455354 (patch) | |
tree | f386b4b538fa270fa48314fe96bc96ab7a62c739 /avoid-boost-fusion-1.61.patch | |
parent | d99a1f17f539fd2b11c06b078592e6659d4d638a (diff) | |
download | aur-97db4b9ec0879f0e339861dbbb151eebba455354.tar.gz |
apply upstream patch for compilation with boost-1.61
Diffstat (limited to 'avoid-boost-fusion-1.61.patch')
-rw-r--r-- | avoid-boost-fusion-1.61.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/avoid-boost-fusion-1.61.patch b/avoid-boost-fusion-1.61.patch new file mode 100644 index 000000000000..868ac71406f1 --- /dev/null +++ b/avoid-boost-fusion-1.61.patch @@ -0,0 +1,28 @@ +diff --git a/dune/istl/tutorial/example.cc b/dune/istl/tutorial/example.cc +index cc52ba8..46719b2 100644 +--- a/dune/istl/tutorial/example.cc ++++ b/dune/istl/tutorial/example.cc +@@ -508,6 +508,14 @@ void test_Interface () + + + #ifdef HAVE_BOOST_FUSION ++#include <boost/version.hpp> ++#if BOOST_VERSION < 106100 ++#define HAVE_USABLE_BOOST_FUSION ++#endif ++#endif ++ ++#ifdef HAVE_USABLE_BOOST_FUSION ++ + + void test_MultiTypeBlockVector_MultiTypeBlockMatrix() { //Jacobi Solver Test MultiTypeBlockMatrix_Solver::dbjac on MultiTypeBlockMatrix<BCRSMatrix> + +@@ -612,7 +620,7 @@ int main (int /*argc*/, char ** /*argv*/) + test_IO(); + test_Iter(); + test_Interface(); +-#ifdef HAVE_BOOST_FUSION ++#ifdef HAVE_USABLE_BOOST_FUSION + test_MultiTypeBlockVector_MultiTypeBlockMatrix(); + #endif + } |