]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Fix compilation with BOOST 1.64
authorDaniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Mon, 24 Apr 2017 22:29:49 +0000 (00:29 +0200)
committerDaniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Mon, 24 Apr 2017 22:30:09 +0000 (00:30 +0200)
include/deal.II/base/aligned_vector.h
include/deal.II/lac/la_vector.h
include/deal.II/lac/sparsity_pattern.h
include/deal.II/lac/vector.h

index 9f3c431e43dccb4f00de4640d2c59fd08f387e31..c2253221e3b53bcde641dd1f510d9e95de425ee9 100644 (file)
 #include <deal.II/base/memory_consumption.h>
 #include <deal.II/base/utilities.h>
 #include <deal.II/base/parallel.h>
-#include <boost/serialization/array.hpp>
+
+// boost::serialization::make_array used to be in array.hpp, but was
+// moved to a different file in BOOST 1.64
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 106400
+#  include <boost/serialization/array_wrapper.hpp>
+#else
+#  include <boost/serialization/array.hpp>
+#endif
 #include <boost/serialization/split_member.hpp>
 
 #include <cstring>
index 609207b07edfff9a867295c1264aa73af909ac10..380954c4344205d35cd1bc0b86c24300dd3fe8a5 100644 (file)
 #include <deal.II/lac/read_write_vector.h>
 #include <deal.II/lac/vector_space_vector.h>
 #include <deal.II/lac/vector_type_traits.h>
-#include <boost/serialization/array.hpp>
+
+// boost::serialization::make_array used to be in array.hpp, but was
+// moved to a different file in BOOST 1.64
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 106400
+#  include <boost/serialization/array_wrapper.hpp>
+#else
+#  include <boost/serialization/array.hpp>
+#endif
 #include <boost/serialization/split_member.hpp>
 
 #include <cstdio>
index f8d9b29aeb24d61d2753024779e44e08ce554c24..369a58c554cde8d47d7e18a9898f401b1f9f98a3 100644 (file)
 #include <deal.II/base/config.h>
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/subscriptor.h>
-#include <boost/serialization/array.hpp>
+
+// boost::serialization::make_array used to be in array.hpp, but was
+// moved to a different file in BOOST 1.64
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 106400
+#  include <boost/serialization/array_wrapper.hpp>
+#else
+#  include <boost/serialization/array.hpp>
+#endif
 #include <boost/serialization/split_member.hpp>
 
 #include <vector>
 #include <iostream>
+#include <algorithm>
 
 DEAL_II_NAMESPACE_OPEN
 
index d5bf2b678c76c70a1e2f36a8d463b79d6ae798a6..7f6431c34ebb83f3b2261a34e3e4130ff7094c56 100644 (file)
 #include <deal.II/base/subscriptor.h>
 #include <deal.II/base/index_set.h>
 #include <deal.II/lac/vector_type_traits.h>
-#include <boost/serialization/array.hpp>
+
+// boost::serialization::make_array used to be in array.hpp, but was
+// moved to a different file in BOOST 1.64
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 106400
+#  include <boost/serialization/array_wrapper.hpp>
+#else
+#  include <boost/serialization/array.hpp>
+#endif
 #include <boost/serialization/split_member.hpp>
 
 #include <cstdio>

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.