blob: 2f358c04fa67390fab2623dc2c68ec1901cd1b53 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
From 13bc2f8a021316d38be0c0fcaa93aa177e214d86 Mon Sep 17 00:00:00 2001
From: Marc Fehling <mafehling.git@gmail.com>
Date: Wed, 16 Dec 2020 18:59:51 -0700
Subject: [PATCH] Added missing header for boost 1.75.0.
---
include/deal.II/base/bounding_box.h | 3 +++
include/deal.II/base/config.h.in | 7 +++++++
2 files changed, 10 insertions(+)
diff --git a/include/deal.II/base/bounding_box.h b/include/deal.II/base/bounding_box.h
index c842c8796a..937783de0e 100644
--- a/include/deal.II/base/bounding_box.h
+++ b/include/deal.II/base/bounding_box.h
@@ -26,6 +26,9 @@
DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
#include <boost/geometry/algorithms/envelope.hpp>
#include <boost/geometry/geometries/multi_point.hpp>
+#if DEAL_II_BOOST_VERSION_GTE(1, 75, 0)
+# include <boost/geometry/strategies/envelope/cartesian.hpp>
+#endif
DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
DEAL_II_NAMESPACE_OPEN
diff --git a/include/deal.II/base/config.h.in b/include/deal.II/base/config.h.in
index df9b8bad0b..205c5e6952 100644
--- a/include/deal.II/base/config.h.in
+++ b/include/deal.II/base/config.h.in
@@ -238,6 +238,13 @@
#define DEAL_II_BOOST_VERSION_MINOR @Boost_MINOR_VERSION@
#define DEAL_II_BOOST_VERSION_SUBMINOR @Boost_SUBMINOR_VERSION@
+#define DEAL_II_BOOST_VERSION_GTE(major,minor,subminor) \
+ ((DEAL_II_BOOST_VERSION_MAJOR * 100000 + \
+ DEAL_II_BOOST_VERSION_MINOR * 100 + \
+ DEAL_II_BOOST_VERSION_SUBMINOR) \
+ >= \
+ (major)*100000 + (minor)*100 + (subminor))
+
/*
* Gmsh:
*/
--
2.29.2
|