From 9c874026deeb51c613e0418d37679fdf6b27c3e0 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Tue, 25 Apr 2017 00:29:49 +0200 Subject: [PATCH] Fix compilation with BOOST 1.64 --- include/deal.II/base/aligned_vector.h | 10 +++++++++- include/deal.II/lac/la_vector.h | 10 +++++++++- include/deal.II/lac/sparsity_pattern.h | 11 ++++++++++- include/deal.II/lac/vector.h | 10 +++++++++- 4 files changed, 37 insertions(+), 4 deletions(-) diff --git a/include/deal.II/base/aligned_vector.h b/include/deal.II/base/aligned_vector.h index 9f3c431e43..c2253221e3 100644 --- a/include/deal.II/base/aligned_vector.h +++ b/include/deal.II/base/aligned_vector.h @@ -22,7 +22,15 @@ #include #include #include -#include + +// boost::serialization::make_array used to be in array.hpp, but was +// moved to a different file in BOOST 1.64 +#include +#if BOOST_VERSION >= 106400 +# include +#else +# include +#endif #include #include diff --git a/include/deal.II/lac/la_vector.h b/include/deal.II/lac/la_vector.h index 609207b07e..380954c434 100644 --- a/include/deal.II/lac/la_vector.h +++ b/include/deal.II/lac/la_vector.h @@ -24,7 +24,15 @@ #include #include #include -#include + +// boost::serialization::make_array used to be in array.hpp, but was +// moved to a different file in BOOST 1.64 +#include +#if BOOST_VERSION >= 106400 +# include +#else +# include +#endif #include #include diff --git a/include/deal.II/lac/sparsity_pattern.h b/include/deal.II/lac/sparsity_pattern.h index f8d9b29aeb..369a58c554 100644 --- a/include/deal.II/lac/sparsity_pattern.h +++ b/include/deal.II/lac/sparsity_pattern.h @@ -20,11 +20,20 @@ #include #include #include -#include + +// boost::serialization::make_array used to be in array.hpp, but was +// moved to a different file in BOOST 1.64 +#include +#if BOOST_VERSION >= 106400 +# include +#else +# include +#endif #include #include #include +#include DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/lac/vector.h b/include/deal.II/lac/vector.h index d5bf2b678c..7f6431c34e 100644 --- a/include/deal.II/lac/vector.h +++ b/include/deal.II/lac/vector.h @@ -23,7 +23,15 @@ #include #include #include -#include + +// boost::serialization::make_array used to be in array.hpp, but was +// moved to a different file in BOOST 1.64 +#include +#if BOOST_VERSION >= 106400 +# include +#else +# include +#endif #include #include -- 2.39.5