Minimize boost/geometry.h includes

diff --git a/include/deal.II/boost_adaptors/bounding_box.h b/include/deal.II/boost_adaptors/bounding_box.h
index 45876c52df1cbd2c9160e0ac664b8e1eab33bf56..68b29cf93ff605260a08454e3d2b812226ab0ffc 100644 (file)
--- a/include/deal.II/boost_adaptors/bounding_box.h
+++ b/include/deal.II/boost_adaptors/bounding_box.h
@@ -22,8 +22,6 @@
 
 #include <deal.II/boost_adaptors/point.h>
 
-#include <boost/geometry.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
 
 namespace boost
 {

diff --git a/include/deal.II/boost_adaptors/point.h b/include/deal.II/boost_adaptors/point.h
index b0691ca9436258db1fdbed16c62cbc3c13374dbe..f60bb62c1e783e0fe3c110e328e813212559c4d2 100644 (file)
--- a/include/deal.II/boost_adaptors/point.h
+++ b/include/deal.II/boost_adaptors/point.h
@@ -20,9 +20,6 @@
 
 #include <deal.II/base/point.h>
 
-#include <boost/geometry.hpp>
-
-
 namespace boost
 {
   namespace geometry

diff --git a/include/deal.II/boost_adaptors/segment.h b/include/deal.II/boost_adaptors/segment.h
index f61f9769b25f249fe3ff6efc1d5c1e1f3a840ef1..97ad3201f7706da5bf0a0b08ecd3b2fc2066d1a0 100644 (file)
--- a/include/deal.II/boost_adaptors/segment.h
+++ b/include/deal.II/boost_adaptors/segment.h
@@ -22,7 +22,7 @@
 
 #include <deal.II/boost_adaptors/point.h>
 
-#include <boost/geometry.hpp>
+#include <boost/geometry/geometries/segment.hpp>
 
 DEAL_II_NAMESPACE_OPEN
 

diff --git a/include/deal.II/numerics/rtree.h b/include/deal.II/numerics/rtree.h
index 5f8d80cb841c34cb67dc2f41727e4d2ab5dacf79..3a90eedd3d9d3a7f1af6710f510a9213af5764e7 100644 (file)
--- a/include/deal.II/numerics/rtree.h
+++ b/include/deal.II/numerics/rtree.h
@@ -24,7 +24,10 @@
 #include <deal.II/boost_adaptors/point.h>
 #include <deal.II/boost_adaptors/segment.h>
 
-#include <boost/geometry.hpp>
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
+#include <boost/geometry/index/rtree.hpp>
+#include <boost/geometry/strategies/strategies.hpp>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <memory>
 

diff --git a/source/grid/grid_tools_cache.cc b/source/grid/grid_tools_cache.cc
index 938ca9d725226a017e50a746584e1a8867dd2f5e..6b3d842a878d7b03eb42596653f48d5606c93006 100644 (file)
--- a/source/grid/grid_tools_cache.cc
+++ b/source/grid/grid_tools_cache.cc
@@ -20,8 +20,6 @@
 #include <deal.II/grid/grid_tools.h>
 #include <deal.II/grid/grid_tools_cache.h>
 
-#include <boost/geometry.hpp>
-
 DEAL_II_NAMESPACE_OPEN
 
 namespace GridTools

diff --git a/tests/base/point_04.cc b/tests/base/point_04.cc
index 7a7c8eaae43ae3c930a26aa681475f72d0f3b8fe..91d3b207cc875d9bde746d74ec5a6ef1975eb7d5 100644 (file)
--- a/tests/base/point_04.cc
+++ b/tests/base/point_04.cc
@@ -20,8 +20,6 @@
 
 #include <deal.II/lac/vector.h>
 
-#include <boost/geometry.hpp>
-
 #include "../tests.h"
 
 namespace bg = boost::geometry;

diff --git a/tests/boost/bounding_box_adaptor_01.cc b/tests/boost/bounding_box_adaptor_01.cc
index 6d25b7a1983386ff67c6a29d221784c6c48f7200..5a866328bb20a0791262495a53f531e5222235d0 100644 (file)
--- a/tests/boost/bounding_box_adaptor_01.cc
+++ b/tests/boost/bounding_box_adaptor_01.cc
@@ -17,6 +17,8 @@
 
 #include <deal.II/boost_adaptors/bounding_box.h>
 
+#include <boost/geometry/algorithms/equals.hpp>
+
 #include "../tests.h"
 
 namespace bg = boost::geometry;

diff --git a/tests/boost/point_adaptor_01.cc b/tests/boost/point_adaptor_01.cc
index ebb17e0c6f4e6e53341826bda550e6566c7ca698..4eec9fbf2339cd3e30ae441c42446d19f7f6f77a 100644 (file)
--- a/tests/boost/point_adaptor_01.cc
+++ b/tests/boost/point_adaptor_01.cc
@@ -17,6 +17,9 @@
 
 #include <deal.II/boost_adaptors/point.h>
 
+#include <boost/geometry/algorithms/equals.hpp>
+#include <boost/geometry/algorithms/make.hpp>
+
 #include "../tests.h"
 
 namespace bg = boost::geometry;

diff --git a/tests/boost/rtree_01.cc b/tests/boost/rtree_01.cc
index 56b2711fe87cb0a6edc7d9c1a0670fef59523bfc..4acfd6a64df13ca9e109899c473782a474ab6ceb 100644 (file)
--- a/tests/boost/rtree_01.cc
+++ b/tests/boost/rtree_01.cc
@@ -19,6 +19,9 @@
 
 #include <deal.II/boost_adaptors/point.h>
 
+#include <boost/geometry/index/rtree.hpp>
+#include <boost/geometry/strategies/strategies.hpp>
+
 #include <algorithm>
 
 #include "../tests.h"