Remove deprecated header

gassmoeller · tjhei · commit 05c18eb846b4 · 2018-06-21T21:36:03.000-07:00
diff --git a/include/aspect/geometry_model/spherical_shell.h b/include/aspect/geometry_model/spherical_shell.h
@@ -25,7 +25,9 @@
 #include <aspect/geometry_model/interface.h>
 #include <aspect/simulator_access.h>
 
+#if !DEAL_II_VERSION_GTE(9,0,0)
 #include <deal.II/grid/tria_boundary_lib.h>
+#endif
 #include <deal.II/grid/manifold_lib.h>
 
 namespace aspect
diff --git a/source/geometry_model/chunk.cc b/source/geometry_model/chunk.cc
@@ -27,8 +27,10 @@
 #include <deal.II/grid/tria_iterator.h>
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/grid_tools.h>
+
+#if !DEAL_II_VERSION_GTE(9,0,0)
 #include <deal.II/grid/tria_boundary_lib.h>
-#include <deal.II/grid/manifold_lib.h>
+#endif
 
 
 namespace aspect
diff --git a/source/geometry_model/ellipsoidal_chunk.cc b/source/geometry_model/ellipsoidal_chunk.cc
@@ -22,7 +22,11 @@
 #include <aspect/geometry_model/ellipsoidal_chunk.h>
 #include <aspect/utilities.h>
 #include <deal.II/grid/tria_iterator.h>
+
+#if !DEAL_II_VERSION_GTE(9,0,0)
 #include <deal.II/grid/tria_boundary_lib.h>
+#endif
+
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/grid_tools.h>
diff --git a/source/geometry_model/sphere.cc b/source/geometry_model/sphere.cc
@@ -23,8 +23,10 @@
 #include <aspect/geometry_model/initial_topography_model/zero_topography.h>
 
 #include <deal.II/grid/grid_generator.h>
-#include <deal.II/grid/tria_boundary_lib.h>
 
+#if !DEAL_II_VERSION_GTE(9,0,0)
+#include <deal.II/grid/tria_boundary_lib.h>
+#endif
 
 namespace aspect
 {
diff --git a/source/geometry_model/spherical_shell.cc b/source/geometry_model/spherical_shell.cc
@@ -23,8 +23,6 @@
 #include <aspect/geometry_model/initial_topography_model/zero_topography.h>
 
 #include <deal.II/grid/grid_generator.h>
-#include <deal.II/grid/tria_boundary_lib.h>
-#include <deal.II/grid/manifold_lib.h>
 #include <aspect/utilities.h>
 
 namespace aspect

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,10 @@`
`23`	`23`	`#include <aspect/geometry_model/initial_topography_model/zero_topography.h>`
`24`	`24`
`25`	`25`	`#include <deal.II/grid/grid_generator.h>`
`26`		`-#include <deal.II/grid/tria_boundary_lib.h>`
`27`	`26`
	`27`	`+#if !DEAL_II_VERSION_GTE(9,0,0)`
	`28`	`+#include <deal.II/grid/tria_boundary_lib.h>`
	`29`	`+#endif`
`28`	`30`
`29`	`31`	`namespace aspect`
`30`	`32`	`{`