Forward declare ParameterHandler.

diff --git a/examples/step-34/step-34.cc b/examples/step-34/step-34.cc
index 4332ff5c4b4af5e54a4aaaa63521163b5663ad5c..9f143268489853d8b8acb46f35cb9ea374c4f36a 100644 (file)
--- a/examples/step-34/step-34.cc
+++ b/examples/step-34/step-34.cc
@@ -27,6 +27,7 @@
 #include <deal.II/base/convergence_table.h>
 #include <deal.II/base/quadrature_lib.h>
 #include <deal.II/base/quadrature_selector.h>
+#include <deal.II/base/parameter_handler.h>
 #include <deal.II/base/parsed_function.h>
 #include <deal.II/base/utilities.h>
 

diff --git a/include/deal.II/base/parsed_convergence_table.h b/include/deal.II/base/parsed_convergence_table.h
index c79805758b35e5cbc139425d4d36a777acf044b4..3147e596ebe83ea8639bae07d0b6ce10b390e54d 100644 (file)
--- a/include/deal.II/base/parsed_convergence_table.h
+++ b/include/deal.II/base/parsed_convergence_table.h
@@ -21,7 +21,6 @@
 #include <deal.II/base/convergence_table.h>
 #include <deal.II/base/function.h>
 #include <deal.II/base/function_parser.h>
-#include <deal.II/base/parameter_handler.h>
 #include <deal.II/base/quadrature_lib.h>
 
 #include <deal.II/dofs/dof_handler.h>
@@ -36,6 +35,10 @@
 
 DEAL_II_NAMESPACE_OPEN
 
+#ifndef DOXYGEN
+class ParameterHandler;
+#endif
+
 /**
  * @brief The ParsedConvergenceTable class
  *

diff --git a/include/deal.II/base/parsed_function.h b/include/deal.II/base/parsed_function.h
index 092aa2650bdc4b477eb2b7d3051394d560d2d308..8df356c1dd06657bb6e80b4626cd751984be86a5 100644 (file)
--- a/include/deal.II/base/parsed_function.h
+++ b/include/deal.II/base/parsed_function.h
@@ -21,10 +21,13 @@
 
 #include <deal.II/base/auto_derivative_function.h>
 #include <deal.II/base/function_parser.h>
-#include <deal.II/base/parameter_handler.h>
 
 DEAL_II_NAMESPACE_OPEN
 
+#ifndef DOXYGEN
+class ParameterHandler;
+#endif
+
 namespace Functions
 {
   /**

diff --git a/include/deal.II/gmsh/utilities.h b/include/deal.II/gmsh/utilities.h
index 466bf0ff3b5858c9262248bb941df73732a56ca7..40519c97fd23937e851244822072816844674885 100644 (file)
--- a/include/deal.II/gmsh/utilities.h
+++ b/include/deal.II/gmsh/utilities.h
@@ -30,12 +30,14 @@
 #    include <TopoDS_Vertex.hxx>
 #  endif
 
-#  include <deal.II/base/parameter_handler.h>
-
 #  include <deal.II/grid/tria.h>
 
 DEAL_II_NAMESPACE_OPEN
 
+#  ifndef DOXYGEN
+class ParameterHandler;
+#  endif
+
 /**
  * A collection of %Gmsh related utilities and classes.
  */

diff --git a/include/deal.II/grid/grid_generator.h b/include/deal.II/grid/grid_generator.h
index 59bc5a25d9a375c80f4abc260ee9e03a857705c6..0647536143dae144ad6909bbceffa1336c963f4b 100644 (file)
--- a/include/deal.II/grid/grid_generator.h
+++ b/include/deal.II/grid/grid_generator.h
@@ -21,7 +21,6 @@
 
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/function.h>
-#include <deal.II/base/parameter_handler.h>
 #include <deal.II/base/point.h>
 #include <deal.II/base/table.h>
 
@@ -35,6 +34,10 @@
 
 DEAL_II_NAMESPACE_OPEN
 
+#ifndef DOXYGEN
+class ParameterHandler;
+#endif
+
 /**
  * This namespace provides a collection of functions for generating
  * triangulations for some basic geometries.

diff --git a/include/deal.II/numerics/dof_output_operator.h b/include/deal.II/numerics/dof_output_operator.h
index 152afd7f750f6a4196cc65dbe3f9fd1495fc2355..6293fe7f01dc7f6d8ea1946a8bddac581fa0d587 100644 (file)
--- a/include/deal.II/numerics/dof_output_operator.h
+++ b/include/deal.II/numerics/dof_output_operator.h
@@ -23,7 +23,6 @@
 #include <deal.II/algorithms/operator.h>
 
 #include <deal.II/base/event.h>
-#include <deal.II/base/parameter_handler.h>
 
 #include <deal.II/dofs/dof_handler.h>
 
@@ -33,6 +32,10 @@
 
 DEAL_II_NAMESPACE_OPEN
 
+#ifndef DOXYGEN
+class ParameterHandler;
+#endif
+
 namespace Algorithms
 {
   /**

diff --git a/include/deal.II/numerics/dof_output_operator.templates.h b/include/deal.II/numerics/dof_output_operator.templates.h
index f41bce71521c87e85593bb778798a53eb9487eb0..53c2daf4eced103f020894997f86af250ebed0ee 100644 (file)
--- a/include/deal.II/numerics/dof_output_operator.templates.h
+++ b/include/deal.II/numerics/dof_output_operator.templates.h
@@ -19,6 +19,8 @@
 
 #include <deal.II/base/config.h>
 
+#include <deal.II/base/parameter_handler.h>
+
 #include <deal.II/numerics/dof_output_operator.h>
 
 DEAL_II_NAMESPACE_OPEN

diff --git a/source/algorithms/operator.cc b/source/algorithms/operator.cc
index 056556e1d12a6d855b2b4f3d9f74cd8e977fa942..bfff74799b5c658b5a40027be5227f0a7a9fca4d 100644 (file)
--- a/source/algorithms/operator.cc
+++ b/source/algorithms/operator.cc
@@ -19,7 +19,6 @@
 #include <deal.II/algorithms/theta_timestepping.templates.h>
 
 #include <deal.II/base/logstream.h>
-#include <deal.II/base/parameter_handler.h>
 
 #include <deal.II/lac/block_vector.h>
 #include <deal.II/lac/la_parallel_block_vector.h>

diff --git a/source/base/parsed_function.cc b/source/base/parsed_function.cc
index c751c702b281cf12af6800045417ecdcd718758a..e5692f6c4ec48ee3ec241a6a95d24f986d0059d2 100644 (file)
--- a/source/base/parsed_function.cc
+++ b/source/base/parsed_function.cc
@@ -13,11 +13,10 @@
 //
 // ---------------------------------------------------------------------
 
+#include <deal.II/base/parameter_handler.h>
 #include <deal.II/base/parsed_function.h>
 #include <deal.II/base/utilities.h>
 
-#include <cstdio>
-
 DEAL_II_NAMESPACE_OPEN
 
 namespace Functions

diff --git a/source/gmsh/utilities.cc b/source/gmsh/utilities.cc
index 7609abfcf0be9d068f85031b526a45dd40864969..fedc13e86d17fbbc2c23ad666e2824453bb026c8 100644 (file)
--- a/source/gmsh/utilities.cc
+++ b/source/gmsh/utilities.cc
@@ -13,6 +13,8 @@
 //
 // ---------------------------------------------------------------------
 
+#include <deal.II/base/parameter_handler.h>
+
 #include <deal.II/gmsh/utilities.h>
 
 #include <deal.II/grid/grid_in.h>

diff --git a/source/grid/grid_generator.cc b/source/grid/grid_generator.cc
index ac3307101b81d831cafc6767a95384a21bcab615..bcd356c50bc804f267c5940bf10dfe7c0410ff49 100644 (file)
--- a/source/grid/grid_generator.cc
+++ b/source/grid/grid_generator.cc
@@ -14,6 +14,7 @@
 // ---------------------------------------------------------------------
 
 #include <deal.II/base/ndarray.h>
+#include <deal.II/base/parameter_handler.h>
 
 #include <deal.II/distributed/fully_distributed_tria.h>
 #include <deal.II/distributed/shared_tria.h>

diff --git a/tests/base/parsed_convergence_table_01.cc b/tests/base/parsed_convergence_table_01.cc
index a26cf331b6771a362a5a7e4842977e3b51154ee1..18ed5d8ac3440e3f4a322cb00f943677e73f61a7 100644 (file)
--- a/tests/base/parsed_convergence_table_01.cc
+++ b/tests/base/parsed_convergence_table_01.cc
@@ -16,6 +16,7 @@
 // Test the functionality of the ParsedConvergenceTable class
 
 #include <deal.II/base/function_lib.h>
+#include <deal.II/base/parameter_handler.h>
 #include <deal.II/base/parsed_convergence_table.h>
 
 #include <deal.II/dofs/dof_handler.h>

diff --git a/tests/base/parsed_convergence_table_02.cc b/tests/base/parsed_convergence_table_02.cc
index e0d8c61e170d368e1736d9a35a1f4a65e949aea3..467c2dff47c9867ca450029a771f55838156a874 100644 (file)
--- a/tests/base/parsed_convergence_table_02.cc
+++ b/tests/base/parsed_convergence_table_02.cc
@@ -15,6 +15,7 @@
 
 // Output standard parameters for ParsedConvergenceTable class
 
+#include <deal.II/base/parameter_handler.h>
 #include <deal.II/base/parsed_convergence_table.h>
 
 #include "../tests.h"

diff --git a/tests/base/parsed_convergence_table_03.cc b/tests/base/parsed_convergence_table_03.cc
index 9bbecf63e39420b50e3c8f05b1763b10ee3a3508..73db77a78651cd09dd3db4a51c9f64b44b5e02db 100644 (file)
--- a/tests/base/parsed_convergence_table_03.cc
+++ b/tests/base/parsed_convergence_table_03.cc
@@ -17,6 +17,7 @@
 // non scalar functions.
 
 #include <deal.II/base/function_lib.h>
+#include <deal.II/base/parameter_handler.h>
 #include <deal.II/base/parsed_convergence_table.h>
 
 #include <deal.II/dofs/dof_handler.h>

diff --git a/tests/base/parsed_convergence_table_04.cc b/tests/base/parsed_convergence_table_04.cc
index ddf690b1625f6914733a90e321a2ee34eb333968..2404d5c9d89604766a2ef3a315694918ff9205eb 100644 (file)
--- a/tests/base/parsed_convergence_table_04.cc
+++ b/tests/base/parsed_convergence_table_04.cc
@@ -17,6 +17,7 @@
 // vector functions, single component
 
 #include <deal.II/base/function_lib.h>
+#include <deal.II/base/parameter_handler.h>
 #include <deal.II/base/parsed_convergence_table.h>
 
 #include <deal.II/dofs/dof_handler.h>

diff --git a/tests/base/parsed_convergence_table_05.cc b/tests/base/parsed_convergence_table_05.cc
index d356111b06e4455a80f6f1065e23fbab7ddd8e81..f5acdedd2f48cb245d183cda1901094664bb7e9a 100644 (file)
--- a/tests/base/parsed_convergence_table_05.cc
+++ b/tests/base/parsed_convergence_table_05.cc
@@ -17,6 +17,7 @@
 // vector function + scalar function
 
 #include <deal.II/base/function_lib.h>
+#include <deal.II/base/parameter_handler.h>
 #include <deal.II/base/parsed_convergence_table.h>
 
 #include <deal.II/dofs/dof_handler.h>

diff --git a/tests/base/parsed_convergence_table_06.cc b/tests/base/parsed_convergence_table_06.cc
index b4af189c1fd35fad5351db6dc4371c644023eb38..3d70783fcd00f2df89739c0856a781147745018f 100644 (file)
--- a/tests/base/parsed_convergence_table_06.cc
+++ b/tests/base/parsed_convergence_table_06.cc
@@ -17,6 +17,7 @@
 // vector function + scalar function, ignore second component
 
 #include <deal.II/base/function_lib.h>
+#include <deal.II/base/parameter_handler.h>
 #include <deal.II/base/parsed_convergence_table.h>
 
 #include <deal.II/dofs/dof_handler.h>

diff --git a/tests/base/parsed_convergence_table_07.cc b/tests/base/parsed_convergence_table_07.cc
index a8194fc14514f589a2cb7d57cbf2fe1a1cd94b1d..16de03a4c9d0f5923a7ff0c921d935680761f525 100644 (file)
--- a/tests/base/parsed_convergence_table_07.cc
+++ b/tests/base/parsed_convergence_table_07.cc
@@ -17,6 +17,7 @@
 // custom error computations
 
 #include <deal.II/base/function_lib.h>
+#include <deal.II/base/parameter_handler.h>
 #include <deal.II/base/parsed_convergence_table.h>
 
 #include <deal.II/dofs/dof_handler.h>

diff --git a/tests/base/parsed_convergence_table_08.cc b/tests/base/parsed_convergence_table_08.cc
index 2d0be867b67f96a550cf7ba2d67e47817d7aa12e..e0cc8becab2b4fc3205e2dcc64476ee484abaaf5 100644 (file)
--- a/tests/base/parsed_convergence_table_08.cc
+++ b/tests/base/parsed_convergence_table_08.cc
@@ -17,6 +17,7 @@
 // custom error computations, with no extra columns.
 
 #include <deal.II/base/function_lib.h>
+#include <deal.II/base/parameter_handler.h>
 #include <deal.II/base/parsed_convergence_table.h>
 
 #include <deal.II/dofs/dof_handler.h>

diff --git a/tests/base/parsed_convergence_table_09.cc b/tests/base/parsed_convergence_table_09.cc
index db0c0aad233c3a7c92a4b0cabc2bb24782dbead3..338773425a77851c9198b2a89e1077450930133b 100644 (file)
--- a/tests/base/parsed_convergence_table_09.cc
+++ b/tests/base/parsed_convergence_table_09.cc
@@ -17,6 +17,7 @@
 // custom error computations, time rates
 
 #include <deal.II/base/function_lib.h>
+#include <deal.II/base/parameter_handler.h>
 #include <deal.II/base/parsed_convergence_table.h>
 
 #include <deal.II/dofs/dof_handler.h>

diff --git a/tests/base/parsed_convergence_table_10.cc b/tests/base/parsed_convergence_table_10.cc
index d217a138df51e45ee0cfdea610085950b2d47c26..3b3ae0b8955265a5ba36dc278044d32ca47118da 100644 (file)
--- a/tests/base/parsed_convergence_table_10.cc
+++ b/tests/base/parsed_convergence_table_10.cc
@@ -17,6 +17,7 @@
 // custom error computations, writing to files
 
 #include <deal.II/base/function_lib.h>
+#include <deal.II/base/parameter_handler.h>
 #include <deal.II/base/parsed_convergence_table.h>
 
 #include <deal.II/dofs/dof_handler.h>

diff --git a/tests/base/parsed_convergence_table_11.cc b/tests/base/parsed_convergence_table_11.cc
index 1ce9182ddd89ea08c6751b4bed4732f00db8ac2c..99d5942ea6310ae4fefbbc562f33b766e6781151 100644 (file)
--- a/tests/base/parsed_convergence_table_11.cc
+++ b/tests/base/parsed_convergence_table_11.cc
@@ -17,6 +17,7 @@
 // between finite element solutions
 
 #include <deal.II/base/function_lib.h>
+#include <deal.II/base/parameter_handler.h>
 #include <deal.II/base/parsed_convergence_table.h>
 
 #include <deal.II/dofs/dof_handler.h>