remove boost/geometry.hpp from Point

We are including point.h in large parts of deal.II and the
boost/geometry/ header is a shortcut to include all of boost geometry.
Instead, only selectively include the parts we actually need. This
should speed up compilation of deal.II.

diff --git a/include/deal.II/base/bounding_box.h b/include/deal.II/base/bounding_box.h
index 9dfc5302b7854e597c86aa665d67a42a3dcfa5d0..60ee0bb4a404a9fe869e762cebd41d88948960ca 100644 (file)
--- a/include/deal.II/base/bounding_box.h
+++ b/include/deal.II/base/bounding_box.h
@@ -23,6 +23,11 @@
 #include <deal.II/base/point.h>
 #include <deal.II/base/utilities.h>
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
+#include <boost/geometry/algorithms/envelope.hpp>
+#include <boost/geometry/geometries/multi_point.hpp>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
+
 DEAL_II_NAMESPACE_OPEN
 
 /**

diff --git a/include/deal.II/base/point.h b/include/deal.II/base/point.h
index d6a109c10e59c5c0d5e39c62a43555552b443cf6..04199d064df3be587809783f9d2bafd0d1236c46 100644 (file)
--- a/include/deal.II/base/point.h
+++ b/include/deal.II/base/point.h
@@ -23,7 +23,8 @@
 #include <deal.II/base/tensor.h>
 
 DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
-#include <boost/geometry.hpp>
+#include <boost/geometry/core/cs.hpp>
+#include <boost/geometry/geometries/point.hpp>
 DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <cmath>

diff --git a/source/base/utilities.cc b/source/base/utilities.cc
index f09f322969180b104649169efd72b84eaf2715ff..d809793fa9778f3d586c58c57c7c6227ac5a724b 100644 (file)
--- a/source/base/utilities.cc
+++ b/source/base/utilities.cc
@@ -30,6 +30,7 @@
 
 DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <boost/iostreams/copy.hpp>
+#include <boost/lexical_cast.hpp>
 #include <boost/random.hpp>
 DEAL_II_ENABLE_EXTRA_DIAGNOSTICS