diff options
Diffstat (limited to '0001-Added-missing-header-for-boost-1.75.0.patch')
-rw-r--r-- | 0001-Added-missing-header-for-boost-1.75.0.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/0001-Added-missing-header-for-boost-1.75.0.patch b/0001-Added-missing-header-for-boost-1.75.0.patch deleted file mode 100644 index 2f358c04fa67..000000000000 --- a/0001-Added-missing-header-for-boost-1.75.0.patch +++ /dev/null @@ -1,45 +0,0 @@ -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 - |