From: Matthias Maier Date: Sun, 24 May 2020 04:58:05 +0000 (-0500) Subject: C++14 cleanup: fix up includes X-Git-Tag: v9.3.0-rc1~1571^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F10338%2Fhead;p=dealii.git C++14 cleanup: fix up includes --- diff --git a/contrib/python-bindings/source/manifold_wrapper.cc b/contrib/python-bindings/source/manifold_wrapper.cc index bf2249fd0d..a7cd3f8c6e 100644 --- a/contrib/python-bindings/source/manifold_wrapper.cc +++ b/contrib/python-bindings/source/manifold_wrapper.cc @@ -13,13 +13,13 @@ // // --------------------------------------------------------------------- -#include - #include #include #include +#include + DEAL_II_NAMESPACE_OPEN namespace python diff --git a/examples/step-14/step-14.cc b/examples/step-14/step-14.cc index e21a762777..a32ece26a6 100644 --- a/examples/step-14/step-14.cc +++ b/examples/step-14/step-14.cc @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include @@ -49,10 +48,11 @@ #include #include -#include +#include #include +#include #include -#include +#include #include // The last step is as in all previous programs: diff --git a/examples/step-53/step-53.cc b/examples/step-53/step-53.cc index b018645035..c60f86b6f7 100644 --- a/examples/step-53/step-53.cc +++ b/examples/step-53/step-53.cc @@ -46,14 +46,9 @@ #include #include -// The last include file is required because we will be using a feature that is -// not part of the C++11 standard. As some of the C++14 features are very -// useful, we provide their implementation in an internal namespace, if the -// compiler does not support them: -#include - -#include #include +#include +#include // The final part of the top matter is to open a namespace into which to put @@ -226,15 +221,12 @@ namespace Step53 } - // This function is required by the interface of the Manifold base - // class, and allows you to clone the AfricaGeometry class. This is - // where we use a feature that is only available in C++14, namely the - // make_unique function, that simplifies the creation of - // std::unique_ptr objects. Notice that, while the function returns an - // std::unique_ptr >, we internally create a - // unique_ptr. C++11 knows how to handle these cases, - // and is able to transform a unique pointer to a derived class to a - // unique pointer to its base class automatically: + // This function is required by the interface of the Manifold base class, + // and allows you to clone the AfricaGeometry class. This is where we use + // a C++14 feature, namely the make_unique function, that simplifies the + // creation of std::unique_ptr objects. Notice that, while the function + // returns a std::unique_ptr>, we internally create a + // unique_ptr. std::unique_ptr> AfricaGeometry::clone() const { return std::make_unique(); diff --git a/examples/step-70/step-70.cc b/examples/step-70/step-70.cc index cdfa13c229..a506e73536 100644 --- a/examples/step-70/step-70.cc +++ b/examples/step-70/step-70.cc @@ -51,7 +51,6 @@ namespace LA #include #include #include -#include #include #include diff --git a/include/deal.II/base/mutable_bind.h b/include/deal.II/base/mutable_bind.h index a644b4fe2e..7e78f5ca1d 100644 --- a/include/deal.II/base/mutable_bind.h +++ b/include/deal.II/base/mutable_bind.h @@ -19,10 +19,10 @@ #include #include -#include #include #include +#include DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/base/patterns.h b/include/deal.II/base/patterns.h index b5698fd43a..748a8308ec 100644 --- a/include/deal.II/base/patterns.h +++ b/include/deal.II/base/patterns.h @@ -21,9 +21,6 @@ #include #include -#include -#include -#include #include #include #include @@ -38,10 +35,12 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include DEAL_II_ENABLE_EXTRA_DIAGNOSTICS +#include #include #include #include #include +#include #include #include #include diff --git a/include/deal.II/base/polynomials_p.h b/include/deal.II/base/polynomials_p.h index c5cb90d2ea..f2a1c75d69 100644 --- a/include/deal.II/base/polynomials_p.h +++ b/include/deal.II/base/polynomials_p.h @@ -23,9 +23,9 @@ #include #include #include -#include #include +#include #include DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/base/std_cxx17/tuple.h b/include/deal.II/base/std_cxx17/tuple.h index 2228e15577..878bf6b357 100644 --- a/include/deal.II/base/std_cxx17/tuple.h +++ b/include/deal.II/base/std_cxx17/tuple.h @@ -20,7 +20,7 @@ #include #ifndef __cpp_lib_apply -# include +# include #endif // __cpp_lib_apply DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/base/tensor.h b/include/deal.II/base/tensor.h index c8ecc33b57..a18260c869 100644 --- a/include/deal.II/base/tensor.h +++ b/include/deal.II/base/tensor.h @@ -20,7 +20,6 @@ #include #include -#include #include #include #include @@ -34,6 +33,7 @@ #include #include +#include #include diff --git a/include/deal.II/fe/fe_dg_vector.templates.h b/include/deal.II/fe/fe_dg_vector.templates.h index 69e85b6b3d..b68998657d 100644 --- a/include/deal.II/fe/fe_dg_vector.templates.h +++ b/include/deal.II/fe/fe_dg_vector.templates.h @@ -20,11 +20,11 @@ #include #include -#include #include #include +#include DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/fe/fe_poly.h b/include/deal.II/fe/fe_poly.h index 2afd1087d9..6c5a3dad10 100644 --- a/include/deal.II/fe/fe_poly.h +++ b/include/deal.II/fe/fe_poly.h @@ -21,10 +21,11 @@ #include #include -#include #include +#include + DEAL_II_NAMESPACE_OPEN /*!@addtogroup febase */ diff --git a/include/deal.II/fe/fe_poly_face.h b/include/deal.II/fe/fe_poly_face.h index f07e5a7381..aee392121f 100644 --- a/include/deal.II/fe/fe_poly_face.h +++ b/include/deal.II/fe/fe_poly_face.h @@ -20,10 +20,10 @@ #include #include -#include #include +#include DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/fe/fe_poly_tensor.h b/include/deal.II/fe/fe_poly_tensor.h index 0bf7b691ed..f5cbf33c2d 100644 --- a/include/deal.II/fe/fe_poly_tensor.h +++ b/include/deal.II/fe/fe_poly_tensor.h @@ -21,7 +21,6 @@ #include #include -#include #include #include @@ -29,6 +28,7 @@ #include +#include DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/fe/fe_tools.h b/include/deal.II/fe/fe_tools.h index fe8b0821fc..07834c164f 100644 --- a/include/deal.II/fe/fe_tools.h +++ b/include/deal.II/fe/fe_tools.h @@ -22,7 +22,6 @@ #include #include -#include #include #include #include @@ -33,6 +32,7 @@ #include +#include #include #include diff --git a/include/deal.II/fe/fe_tools.templates.h b/include/deal.II/fe/fe_tools.templates.h index 2e40735396..76898520b9 100644 --- a/include/deal.II/fe/fe_tools.templates.h +++ b/include/deal.II/fe/fe_tools.templates.h @@ -22,7 +22,6 @@ #include #include #include -#include #include #include diff --git a/include/deal.II/fe/fe_tools_interpolate.templates.h b/include/deal.II/fe/fe_tools_interpolate.templates.h index e0181c8fd9..ae38e6d9f5 100644 --- a/include/deal.II/fe/fe_tools_interpolate.templates.h +++ b/include/deal.II/fe/fe_tools_interpolate.templates.h @@ -22,7 +22,6 @@ #include #include #include -#include #include #include diff --git a/include/deal.II/grid/composition_manifold.h b/include/deal.II/grid/composition_manifold.h index b60f198d81..8d104ce672 100644 --- a/include/deal.II/grid/composition_manifold.h +++ b/include/deal.II/grid/composition_manifold.h @@ -24,7 +24,6 @@ #include #include #include -#include #include #include @@ -32,6 +31,8 @@ #include #include +#include + DEAL_II_NAMESPACE_OPEN /** diff --git a/include/deal.II/grid/filtered_iterator.h b/include/deal.II/grid/filtered_iterator.h index d27e870f70..252df26335 100644 --- a/include/deal.II/grid/filtered_iterator.h +++ b/include/deal.II/grid/filtered_iterator.h @@ -21,10 +21,10 @@ # include # include -# include # include +# include # include # include diff --git a/include/deal.II/grid/tensor_product_manifold.h b/include/deal.II/grid/tensor_product_manifold.h index c222a2faa5..3b6ed820a7 100644 --- a/include/deal.II/grid/tensor_product_manifold.h +++ b/include/deal.II/grid/tensor_product_manifold.h @@ -19,12 +19,13 @@ #include #include -#include #include #include #include +#include + DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/lac/la_parallel_vector.templates.h b/include/deal.II/lac/la_parallel_vector.templates.h index fd2933c449..6efd9a5a78 100644 --- a/include/deal.II/lac/la_parallel_vector.templates.h +++ b/include/deal.II/lac/la_parallel_vector.templates.h @@ -21,7 +21,6 @@ #include #include -#include #include #include @@ -30,6 +29,8 @@ #include #include +#include + DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/lac/qr.h b/include/deal.II/lac/qr.h index 95501984d4..805812a605 100644 --- a/include/deal.II/lac/qr.h +++ b/include/deal.II/lac/qr.h @@ -19,13 +19,14 @@ #include #include -#include #include #include #include +#include + DEAL_II_NAMESPACE_OPEN /** diff --git a/include/deal.II/lac/solver_gmres.h b/include/deal.II/lac/solver_gmres.h index 7cbc765f8a..1e6da69785 100644 --- a/include/deal.II/lac/solver_gmres.h +++ b/include/deal.II/lac/solver_gmres.h @@ -21,7 +21,6 @@ #include #include -#include #include #include @@ -33,6 +32,7 @@ #include #include +#include #include DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/lac/sparsity_pattern.h b/include/deal.II/lac/sparsity_pattern.h index d615c603aa..703c20fb5c 100644 --- a/include/deal.II/lac/sparsity_pattern.h +++ b/include/deal.II/lac/sparsity_pattern.h @@ -22,7 +22,6 @@ #include #include #include -#include #include // boost::serialization::make_array used to be in array.hpp, but was @@ -37,6 +36,7 @@ #include #include +#include #include DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/lac/trilinos_tpetra_vector.templates.h b/include/deal.II/lac/trilinos_tpetra_vector.templates.h index a88d2506e2..d75d263d5a 100644 --- a/include/deal.II/lac/trilinos_tpetra_vector.templates.h +++ b/include/deal.II/lac/trilinos_tpetra_vector.templates.h @@ -18,8 +18,6 @@ #include -#include - #include #ifdef DEAL_II_TRILINOS_WITH_TPETRA diff --git a/include/deal.II/lac/vector_memory.templates.h b/include/deal.II/lac/vector_memory.templates.h index 4b9c6df9de..4c75d7acd7 100644 --- a/include/deal.II/lac/vector_memory.templates.h +++ b/include/deal.II/lac/vector_memory.templates.h @@ -20,10 +20,11 @@ #include #include -#include #include +#include + DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/numerics/data_out_dof_data.templates.h b/include/deal.II/numerics/data_out_dof_data.templates.h index 55c81fdc5f..4eecadc9f1 100644 --- a/include/deal.II/numerics/data_out_dof_data.templates.h +++ b/include/deal.II/numerics/data_out_dof_data.templates.h @@ -23,7 +23,6 @@ #include #include #include -#include #include #include diff --git a/include/deal.II/numerics/history.h b/include/deal.II/numerics/history.h index 27aee75eff..b679b1304f 100644 --- a/include/deal.II/numerics/history.h +++ b/include/deal.II/numerics/history.h @@ -19,9 +19,9 @@ #include #include -#include #include +#include #include DEAL_II_NAMESPACE_OPEN diff --git a/source/base/polynomial.cc b/source/base/polynomial.cc index c83a04900c..cf1d953307 100644 --- a/source/base/polynomial.cc +++ b/source/base/polynomial.cc @@ -18,12 +18,12 @@ #include #include #include -#include #include #include #include #include +#include DEAL_II_NAMESPACE_OPEN diff --git a/source/base/polynomial_space.cc b/source/base/polynomial_space.cc index 8b7e705e1a..330c3a95c8 100644 --- a/source/base/polynomial_space.cc +++ b/source/base/polynomial_space.cc @@ -15,9 +15,10 @@ #include #include -#include #include +#include + DEAL_II_NAMESPACE_OPEN diff --git a/source/base/polynomials_abf.cc b/source/base/polynomials_abf.cc index 3792bc67e6..9b2f86b0be 100644 --- a/source/base/polynomials_abf.cc +++ b/source/base/polynomials_abf.cc @@ -16,10 +16,10 @@ #include #include -#include #include #include +#include DEAL_II_NAMESPACE_OPEN diff --git a/source/base/polynomials_adini.cc b/source/base/polynomials_adini.cc index 2625de0728..3f59807fba 100644 --- a/source/base/polynomials_adini.cc +++ b/source/base/polynomials_adini.cc @@ -15,7 +15,8 @@ #include #include -#include + +#include #define ENTER_COEFFICIENTS( \ koefs, z, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11) \ diff --git a/source/base/polynomials_bdm.cc b/source/base/polynomials_bdm.cc index 678dec0b3f..af37217be6 100644 --- a/source/base/polynomials_bdm.cc +++ b/source/base/polynomials_bdm.cc @@ -18,10 +18,10 @@ #include #include #include -#include #include #include +#include DEAL_II_NAMESPACE_OPEN diff --git a/source/base/polynomials_bernardi_raugel.cc b/source/base/polynomials_bernardi_raugel.cc index 51f6e635c2..749872d049 100644 --- a/source/base/polynomials_bernardi_raugel.cc +++ b/source/base/polynomials_bernardi_raugel.cc @@ -15,7 +15,8 @@ #include -#include + +#include DEAL_II_NAMESPACE_OPEN diff --git a/source/base/polynomials_nedelec.cc b/source/base/polynomials_nedelec.cc index 950f37bb93..3d8e9959ae 100644 --- a/source/base/polynomials_nedelec.cc +++ b/source/base/polynomials_nedelec.cc @@ -17,10 +17,10 @@ #include #include #include -#include #include #include +#include DEAL_II_NAMESPACE_OPEN diff --git a/source/base/polynomials_rannacher_turek.cc b/source/base/polynomials_rannacher_turek.cc index c0ed061b41..cad0091925 100644 --- a/source/base/polynomials_rannacher_turek.cc +++ b/source/base/polynomials_rannacher_turek.cc @@ -16,7 +16,8 @@ #include #include -#include + +#include DEAL_II_NAMESPACE_OPEN diff --git a/source/base/polynomials_raviart_thomas.cc b/source/base/polynomials_raviart_thomas.cc index 36e600e20d..a728e7378a 100644 --- a/source/base/polynomials_raviart_thomas.cc +++ b/source/base/polynomials_raviart_thomas.cc @@ -16,11 +16,11 @@ #include #include -#include #include #include #include +#include // TODO[WB]: This class is not thread-safe: it uses mutable member variables // that contain temporary state. this is not what one would want when one uses a diff --git a/source/base/polynomials_rt_bubbles.cc b/source/base/polynomials_rt_bubbles.cc index f28337f635..62fbcbdef3 100644 --- a/source/base/polynomials_rt_bubbles.cc +++ b/source/base/polynomials_rt_bubbles.cc @@ -17,11 +17,11 @@ #include "deal.II/base/polynomials_rt_bubbles.h" #include -#include #include #include #include +#include DEAL_II_NAMESPACE_OPEN diff --git a/source/base/quadrature.cc b/source/base/quadrature.cc index 15787716c2..25829085e2 100644 --- a/source/base/quadrature.cc +++ b/source/base/quadrature.cc @@ -17,12 +17,12 @@ #include #include #include -#include #include #include #include #include +#include DEAL_II_NAMESPACE_OPEN diff --git a/source/base/tensor_product_polynomials.cc b/source/base/tensor_product_polynomials.cc index 46f7177ad8..77e1460672 100644 --- a/source/base/tensor_product_polynomials.cc +++ b/source/base/tensor_product_polynomials.cc @@ -16,12 +16,12 @@ #include #include #include -#include #include #include #include +#include DEAL_II_NAMESPACE_OPEN diff --git a/source/base/tensor_product_polynomials_bubbles.cc b/source/base/tensor_product_polynomials_bubbles.cc index 802cca256b..6ad931730f 100644 --- a/source/base/tensor_product_polynomials_bubbles.cc +++ b/source/base/tensor_product_polynomials_bubbles.cc @@ -15,9 +15,10 @@ #include -#include #include +#include + DEAL_II_NAMESPACE_OPEN diff --git a/source/base/tensor_product_polynomials_const.cc b/source/base/tensor_product_polynomials_const.cc index 002d6c2704..e9421665b0 100644 --- a/source/base/tensor_product_polynomials_const.cc +++ b/source/base/tensor_product_polynomials_const.cc @@ -15,9 +15,10 @@ #include -#include #include +#include + DEAL_II_NAMESPACE_OPEN diff --git a/source/distributed/fully_distributed_tria.cc b/source/distributed/fully_distributed_tria.cc index 2d76ff040c..5bfc7b3ecc 100644 --- a/source/distributed/fully_distributed_tria.cc +++ b/source/distributed/fully_distributed_tria.cc @@ -16,12 +16,13 @@ #include #include -#include #include #include +#include + DEAL_II_NAMESPACE_OPEN // Forward declarations diff --git a/source/dofs/dof_handler.cc b/source/dofs/dof_handler.cc index aea54f9db3..a65a026a3b 100644 --- a/source/dofs/dof_handler.cc +++ b/source/dofs/dof_handler.cc @@ -15,7 +15,6 @@ #include #include -#include #include #include @@ -34,6 +33,7 @@ #include #include +#include #include #include diff --git a/source/dofs/dof_tools_constraints.cc b/source/dofs/dof_tools_constraints.cc index 54e3df06ac..72a1e7d5cf 100644 --- a/source/dofs/dof_tools_constraints.cc +++ b/source/dofs/dof_tools_constraints.cc @@ -41,8 +41,6 @@ # include #endif -#include - #include #include #include diff --git a/source/fe/fe_abf.cc b/source/fe/fe_abf.cc index cfb693bc81..85eb12392b 100644 --- a/source/fe/fe_abf.cc +++ b/source/fe/fe_abf.cc @@ -17,7 +17,6 @@ #include #include #include -#include #include #include @@ -33,6 +32,7 @@ #include #include +#include #include diff --git a/source/fe/fe_bdm.cc b/source/fe/fe_bdm.cc index 93588bf04a..ba126082e5 100644 --- a/source/fe/fe_bdm.cc +++ b/source/fe/fe_bdm.cc @@ -17,7 +17,6 @@ #include #include #include -#include #include @@ -31,6 +30,7 @@ #include #include +#include #include diff --git a/source/fe/fe_bernardi_raugel.cc b/source/fe/fe_bernardi_raugel.cc index 60ea30e96c..f51963d69f 100644 --- a/source/fe/fe_bernardi_raugel.cc +++ b/source/fe/fe_bernardi_raugel.cc @@ -17,7 +17,6 @@ #include #include #include -#include #include @@ -31,6 +30,7 @@ #include #include +#include #include diff --git a/source/fe/fe_bernstein.cc b/source/fe/fe_bernstein.cc index 245f8c6846..5465595bba 100644 --- a/source/fe/fe_bernstein.cc +++ b/source/fe/fe_bernstein.cc @@ -18,7 +18,6 @@ #include #include #include -#include #include #include @@ -26,6 +25,7 @@ #include #include +#include #include #include diff --git a/source/fe/fe_dg_vector.cc b/source/fe/fe_dg_vector.cc index 01fd10f4e8..1f378ed294 100644 --- a/source/fe/fe_dg_vector.cc +++ b/source/fe/fe_dg_vector.cc @@ -18,10 +18,11 @@ #include #include #include -#include #include +#include + DEAL_II_NAMESPACE_OPEN diff --git a/source/fe/fe_dgp.cc b/source/fe/fe_dgp.cc index f11b4fbb62..49725dc3a6 100644 --- a/source/fe/fe_dgp.cc +++ b/source/fe/fe_dgp.cc @@ -14,12 +14,11 @@ // --------------------------------------------------------------------- -#include - #include #include #include +#include #include diff --git a/source/fe/fe_dgp_monomial.cc b/source/fe/fe_dgp_monomial.cc index e1d2eadd7d..e123dbc0be 100644 --- a/source/fe/fe_dgp_monomial.cc +++ b/source/fe/fe_dgp_monomial.cc @@ -14,12 +14,12 @@ // --------------------------------------------------------------------- -#include #include #include #include +#include #include diff --git a/source/fe/fe_dgp_nonparametric.cc b/source/fe/fe_dgp_nonparametric.cc index c915a44f7a..341a81bf94 100644 --- a/source/fe/fe_dgp_nonparametric.cc +++ b/source/fe/fe_dgp_nonparametric.cc @@ -15,7 +15,6 @@ #include -#include #include @@ -28,6 +27,7 @@ #include #include +#include #include diff --git a/source/fe/fe_dgq.cc b/source/fe/fe_dgq.cc index 14b0f9cad6..429221ebfa 100644 --- a/source/fe/fe_dgq.cc +++ b/source/fe/fe_dgq.cc @@ -16,7 +16,6 @@ #include #include -#include #include #include @@ -32,6 +31,7 @@ #include #include +#include #include diff --git a/source/fe/fe_enriched.cc b/source/fe/fe_enriched.cc index d62b4ebf56..4a138e4760 100644 --- a/source/fe/fe_enriched.cc +++ b/source/fe/fe_enriched.cc @@ -14,13 +14,13 @@ // --------------------------------------------------------------------- -#include - #include #include #include +#include + DEAL_II_NAMESPACE_OPEN namespace internal diff --git a/source/fe/fe_face.cc b/source/fe/fe_face.cc index 08b5409881..9789720605 100644 --- a/source/fe/fe_face.cc +++ b/source/fe/fe_face.cc @@ -15,7 +15,6 @@ #include -#include #include #include @@ -24,6 +23,7 @@ #include +#include #include DEAL_II_NAMESPACE_OPEN diff --git a/source/fe/fe_nedelec.cc b/source/fe/fe_nedelec.cc index b9e57456f4..e46ba88a06 100644 --- a/source/fe/fe_nedelec.cc +++ b/source/fe/fe_nedelec.cc @@ -17,7 +17,6 @@ #include #include #include -#include #include #include @@ -35,6 +34,7 @@ #include #include +#include #include // TODO: implement the adjust_quad_dof_index_for_face_orientation_table and diff --git a/source/fe/fe_nedelec_sz.cc b/source/fe/fe_nedelec_sz.cc index de789f16fb..15a6b4901c 100644 --- a/source/fe/fe_nedelec_sz.cc +++ b/source/fe/fe_nedelec_sz.cc @@ -13,10 +13,11 @@ // // --------------------------------------------------------------------- -#include #include +#include + DEAL_II_NAMESPACE_OPEN // Constructor: diff --git a/source/fe/fe_nothing.cc b/source/fe/fe_nothing.cc index c436565cf2..a1192f2fd2 100644 --- a/source/fe/fe_nothing.cc +++ b/source/fe/fe_nothing.cc @@ -14,10 +14,10 @@ // --------------------------------------------------------------------- -#include - #include +#include + DEAL_II_NAMESPACE_OPEN diff --git a/source/fe/fe_p1nc.cc b/source/fe/fe_p1nc.cc index 9ecdd170c1..54323a09c4 100644 --- a/source/fe/fe_p1nc.cc +++ b/source/fe/fe_p1nc.cc @@ -14,10 +14,10 @@ // --------------------------------------------------------------------- -#include - #include +#include + DEAL_II_NAMESPACE_OPEN diff --git a/source/fe/fe_q.cc b/source/fe/fe_q.cc index 13345b26c6..a085033cc5 100644 --- a/source/fe/fe_q.cc +++ b/source/fe/fe_q.cc @@ -15,7 +15,6 @@ #include -#include #include #include @@ -23,6 +22,7 @@ #include +#include #include #include diff --git a/source/fe/fe_q_base.cc b/source/fe/fe_q_base.cc index ef62048e0c..c2353a0e64 100644 --- a/source/fe/fe_q_base.cc +++ b/source/fe/fe_q_base.cc @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include @@ -30,6 +29,7 @@ #include #include +#include #include #include diff --git a/source/fe/fe_q_bubbles.cc b/source/fe/fe_q_bubbles.cc index f7f9438b7e..464d23a9a7 100644 --- a/source/fe/fe_q_bubbles.cc +++ b/source/fe/fe_q_bubbles.cc @@ -17,7 +17,6 @@ #include #include #include -#include #include #include diff --git a/source/fe/fe_q_dg0.cc b/source/fe/fe_q_dg0.cc index e8c6fabea7..2003961a0a 100644 --- a/source/fe/fe_q_dg0.cc +++ b/source/fe/fe_q_dg0.cc @@ -17,7 +17,6 @@ #include #include #include -#include #include #include @@ -26,6 +25,7 @@ #include #include +#include #include #include diff --git a/source/fe/fe_q_hierarchical.cc b/source/fe/fe_q_hierarchical.cc index 8b7da34c2e..e6b6460391 100644 --- a/source/fe/fe_q_hierarchical.cc +++ b/source/fe/fe_q_hierarchical.cc @@ -14,13 +14,12 @@ // --------------------------------------------------------------------- -#include - #include #include #include #include +#include #include // TODO: implement the adjust_quad_dof_index_for_face_orientation_table and diff --git a/source/fe/fe_q_iso_q1.cc b/source/fe/fe_q_iso_q1.cc index a8b7f40c1f..9447a49032 100644 --- a/source/fe/fe_q_iso_q1.cc +++ b/source/fe/fe_q_iso_q1.cc @@ -15,7 +15,6 @@ #include -#include #include #include @@ -23,6 +22,7 @@ #include +#include #include #include diff --git a/source/fe/fe_rannacher_turek.cc b/source/fe/fe_rannacher_turek.cc index e2a34f7e5c..84f532b573 100644 --- a/source/fe/fe_rannacher_turek.cc +++ b/source/fe/fe_rannacher_turek.cc @@ -15,13 +15,13 @@ #include -#include #include #include #include +#include #include diff --git a/source/fe/fe_raviart_thomas.cc b/source/fe/fe_raviart_thomas.cc index ce0790ffed..47d6a43dde 100644 --- a/source/fe/fe_raviart_thomas.cc +++ b/source/fe/fe_raviart_thomas.cc @@ -17,7 +17,6 @@ #include #include #include -#include #include #include @@ -33,6 +32,7 @@ #include #include +#include #include // TODO: implement the adjust_quad_dof_index_for_face_orientation_table and diff --git a/source/fe/fe_raviart_thomas_nodal.cc b/source/fe/fe_raviart_thomas_nodal.cc index f5c170e56c..895ba4c29d 100644 --- a/source/fe/fe_raviart_thomas_nodal.cc +++ b/source/fe/fe_raviart_thomas_nodal.cc @@ -16,7 +16,6 @@ #include #include -#include #include @@ -30,6 +29,7 @@ #include #include +#include #include diff --git a/source/fe/fe_rt_bubbles.cc b/source/fe/fe_rt_bubbles.cc index 86f4727951..beb7e69407 100644 --- a/source/fe/fe_rt_bubbles.cc +++ b/source/fe/fe_rt_bubbles.cc @@ -16,7 +16,6 @@ #include #include -#include #include @@ -29,6 +28,7 @@ #include #include +#include #include diff --git a/source/fe/fe_system.cc b/source/fe/fe_system.cc index 77a61770ff..c7cbacd625 100644 --- a/source/fe/fe_system.cc +++ b/source/fe/fe_system.cc @@ -16,7 +16,6 @@ #include #include #include -#include #include @@ -28,6 +27,7 @@ #include #include +#include #include diff --git a/source/fe/fe_trace.cc b/source/fe/fe_trace.cc index c1145ebde2..ff99eddce9 100644 --- a/source/fe/fe_trace.cc +++ b/source/fe/fe_trace.cc @@ -17,7 +17,6 @@ #include #include -#include #include #include @@ -28,6 +27,7 @@ #include #include +#include #include DEAL_II_NAMESPACE_OPEN diff --git a/source/fe/fe_values.cc b/source/fe/fe_values.cc index f002d3ddda..22539cda38 100644 --- a/source/fe/fe_values.cc +++ b/source/fe/fe_values.cc @@ -19,7 +19,6 @@ #include #include #include -#include #include @@ -48,6 +47,7 @@ #include #include +#include #include DEAL_II_NAMESPACE_OPEN diff --git a/source/fe/mapping_c1.cc b/source/fe/mapping_c1.cc index 8493ab4d6b..1eb9cb655a 100644 --- a/source/fe/mapping_c1.cc +++ b/source/fe/mapping_c1.cc @@ -13,7 +13,6 @@ // // --------------------------------------------------------------------- -#include #include @@ -22,6 +21,7 @@ #include #include +#include DEAL_II_NAMESPACE_OPEN diff --git a/source/fe/mapping_cartesian.cc b/source/fe/mapping_cartesian.cc index 504023b7ee..c6e5918588 100644 --- a/source/fe/mapping_cartesian.cc +++ b/source/fe/mapping_cartesian.cc @@ -18,7 +18,6 @@ #include #include #include -#include #include #include @@ -33,6 +32,7 @@ #include #include +#include DEAL_II_NAMESPACE_OPEN diff --git a/source/fe/mapping_fe_field.cc b/source/fe/mapping_fe_field.cc index 20773943a6..4fb5ac5702 100644 --- a/source/fe/mapping_fe_field.cc +++ b/source/fe/mapping_fe_field.cc @@ -19,7 +19,6 @@ #include #include #include -#include #include #include diff --git a/source/fe/mapping_manifold.cc b/source/fe/mapping_manifold.cc index e1223e1343..2a22a445b8 100644 --- a/source/fe/mapping_manifold.cc +++ b/source/fe/mapping_manifold.cc @@ -20,7 +20,6 @@ #include #include #include -#include #include #include diff --git a/source/fe/mapping_q.cc b/source/fe/mapping_q.cc index a685222489..1f1112939a 100644 --- a/source/fe/mapping_q.cc +++ b/source/fe/mapping_q.cc @@ -18,7 +18,6 @@ #include #include #include -#include #include #include diff --git a/source/fe/mapping_q1.cc b/source/fe/mapping_q1.cc index 0a1f22f81c..e812cb30c8 100644 --- a/source/fe/mapping_q1.cc +++ b/source/fe/mapping_q1.cc @@ -19,7 +19,6 @@ #include #include #include -#include #include #include diff --git a/source/fe/mapping_q1_eulerian.cc b/source/fe/mapping_q1_eulerian.cc index 057923f07c..90fc1f8a9a 100644 --- a/source/fe/mapping_q1_eulerian.cc +++ b/source/fe/mapping_q1_eulerian.cc @@ -13,7 +13,6 @@ // // --------------------------------------------------------------------- -#include #include #include @@ -34,6 +33,7 @@ #include #include +#include DEAL_II_NAMESPACE_OPEN diff --git a/source/fe/mapping_q_eulerian.cc b/source/fe/mapping_q_eulerian.cc index e8fae5a850..d673492748 100644 --- a/source/fe/mapping_q_eulerian.cc +++ b/source/fe/mapping_q_eulerian.cc @@ -14,7 +14,6 @@ // --------------------------------------------------------------------- #include -#include #include #include @@ -37,6 +36,8 @@ #include #include +#include + DEAL_II_NAMESPACE_OPEN diff --git a/source/fe/mapping_q_generic.cc b/source/fe/mapping_q_generic.cc index 5130c9d986..8316ff41a5 100644 --- a/source/fe/mapping_q_generic.cc +++ b/source/fe/mapping_q_generic.cc @@ -20,7 +20,6 @@ #include #include #include -#include #include #include diff --git a/source/grid/manifold.cc b/source/grid/manifold.cc index 4d59dc6c3a..b839f903fd 100644 --- a/source/grid/manifold.cc +++ b/source/grid/manifold.cc @@ -13,7 +13,6 @@ // // --------------------------------------------------------------------- -#include #include #include @@ -27,6 +26,7 @@ #include #include +#include DEAL_II_NAMESPACE_OPEN diff --git a/source/grid/manifold_lib.cc b/source/grid/manifold_lib.cc index 5076258859..51ddbc2fb4 100644 --- a/source/grid/manifold_lib.cc +++ b/source/grid/manifold_lib.cc @@ -13,7 +13,6 @@ // // --------------------------------------------------------------------- -#include #include #include @@ -27,6 +26,7 @@ #include #include +#include DEAL_II_NAMESPACE_OPEN diff --git a/source/grid/tria.cc b/source/grid/tria.cc index bdb18e7535..71a4988d24 100644 --- a/source/grid/tria.cc +++ b/source/grid/tria.cc @@ -16,7 +16,6 @@ #include #include -#include #include @@ -38,6 +37,7 @@ #include #include #include +#include #include diff --git a/source/hp/dof_handler.cc b/source/hp/dof_handler.cc index b39f72195f..f756aed21b 100644 --- a/source/hp/dof_handler.cc +++ b/source/hp/dof_handler.cc @@ -15,7 +15,6 @@ #include #include -#include #include #include @@ -41,6 +40,7 @@ #include #include +#include #include #include diff --git a/source/hp/fe_values.cc b/source/hp/fe_values.cc index edf8241c37..8bc477b42e 100644 --- a/source/hp/fe_values.cc +++ b/source/hp/fe_values.cc @@ -13,13 +13,14 @@ // // --------------------------------------------------------------------- -#include #include #include #include +#include + DEAL_II_NAMESPACE_OPEN namespace hp diff --git a/source/lac/ginkgo_solver.cc b/source/lac/ginkgo_solver.cc index 2ceac7f73d..4e158c59b6 100644 --- a/source/lac/ginkgo_solver.cc +++ b/source/lac/ginkgo_solver.cc @@ -15,7 +15,6 @@ #include -#include #include @@ -24,6 +23,7 @@ # include # include +# include DEAL_II_NAMESPACE_OPEN diff --git a/source/lac/petsc_solver.cc b/source/lac/petsc_solver.cc index f154976e40..e3536c43c4 100644 --- a/source/lac/petsc_solver.cc +++ b/source/lac/petsc_solver.cc @@ -15,7 +15,6 @@ #include -#include #include @@ -30,6 +29,7 @@ # include # include +# include DEAL_II_NAMESPACE_OPEN diff --git a/source/lac/scalapack.cc b/source/lac/scalapack.cc index dabab61574..6f883e0a22 100644 --- a/source/lac/scalapack.cc +++ b/source/lac/scalapack.cc @@ -21,7 +21,6 @@ # include # include # include -# include # include @@ -29,6 +28,8 @@ # include # endif +# include + DEAL_II_NAMESPACE_OPEN # ifdef DEAL_II_WITH_HDF5 diff --git a/source/lac/sparsity_pattern.cc b/source/lac/sparsity_pattern.cc index e86646d201..608392f9fc 100644 --- a/source/lac/sparsity_pattern.cc +++ b/source/lac/sparsity_pattern.cc @@ -14,7 +14,6 @@ // --------------------------------------------------------------------- -#include #include #include @@ -27,6 +26,7 @@ #include #include #include +#include #include DEAL_II_NAMESPACE_OPEN diff --git a/source/lac/sparsity_tools.cc b/source/lac/sparsity_tools.cc index 646a61f7bf..f825bb1586 100644 --- a/source/lac/sparsity_tools.cc +++ b/source/lac/sparsity_tools.cc @@ -15,7 +15,6 @@ #include -#include #include #include @@ -23,6 +22,7 @@ #include #include +#include #include #ifdef DEAL_II_WITH_MPI diff --git a/source/lac/trilinos_epetra_communication_pattern.cc b/source/lac/trilinos_epetra_communication_pattern.cc index ac160b08b1..28928d48e2 100644 --- a/source/lac/trilinos_epetra_communication_pattern.cc +++ b/source/lac/trilinos_epetra_communication_pattern.cc @@ -13,8 +13,6 @@ // // --------------------------------------------------------------------- -#include - #include #ifdef DEAL_II_WITH_TRILINOS diff --git a/source/lac/trilinos_epetra_vector.cc b/source/lac/trilinos_epetra_vector.cc index 580c7e9d3c..54b4587642 100644 --- a/source/lac/trilinos_epetra_vector.cc +++ b/source/lac/trilinos_epetra_vector.cc @@ -13,8 +13,6 @@ // // --------------------------------------------------------------------- -#include - #include #ifdef DEAL_II_WITH_TRILINOS diff --git a/source/lac/trilinos_solver.cc b/source/lac/trilinos_solver.cc index 990841cf86..b5c162e477 100644 --- a/source/lac/trilinos_solver.cc +++ b/source/lac/trilinos_solver.cc @@ -18,7 +18,6 @@ #ifdef DEAL_II_WITH_TRILINOS # include -# include # include # include @@ -32,6 +31,7 @@ # include # include +# include DEAL_II_NAMESPACE_OPEN diff --git a/source/lac/trilinos_tpetra_communication_pattern.cc b/source/lac/trilinos_tpetra_communication_pattern.cc index 042a93145e..165e94a59a 100644 --- a/source/lac/trilinos_tpetra_communication_pattern.cc +++ b/source/lac/trilinos_tpetra_communication_pattern.cc @@ -13,8 +13,6 @@ // // --------------------------------------------------------------------- -#include - #include #ifdef DEAL_II_TRILINOS_WITH_TPETRA diff --git a/source/lac/trilinos_vector.cc b/source/lac/trilinos_vector.cc index 7db15b70fa..e46c50f5f9 100644 --- a/source/lac/trilinos_vector.cc +++ b/source/lac/trilinos_vector.cc @@ -18,7 +18,6 @@ #ifdef DEAL_II_WITH_TRILINOS # include -# include # include # include @@ -32,6 +31,7 @@ # include # include +# include DEAL_II_NAMESPACE_OPEN diff --git a/source/meshworker/scratch_data.cc b/source/meshworker/scratch_data.cc index eca2d02dce..f26a4a095c 100644 --- a/source/meshworker/scratch_data.cc +++ b/source/meshworker/scratch_data.cc @@ -13,10 +13,10 @@ // // --------------------------------------------------------------------- -#include - #include +#include + DEAL_II_NAMESPACE_OPEN namespace MeshWorker diff --git a/source/numerics/kdtree.cc b/source/numerics/kdtree.cc index 88a1a0090a..43d4952349 100644 --- a/source/numerics/kdtree.cc +++ b/source/numerics/kdtree.cc @@ -17,7 +17,7 @@ #ifdef DEAL_II_WITH_NANOFLANN -# include +# include DEAL_II_NAMESPACE_OPEN diff --git a/source/particles/particle_handler.cc b/source/particles/particle_handler.cc index 075925f3f4..118d591dda 100644 --- a/source/particles/particle_handler.cc +++ b/source/particles/particle_handler.cc @@ -13,13 +13,12 @@ // // --------------------------------------------------------------------- -#include - #include #include #include +#include #include DEAL_II_NAMESPACE_OPEN diff --git a/tests/base/stdcxx14_constexpr_min_max.cc b/tests/base/stdcxx14_constexpr_min_max.cc index 5205916e22..91585ad2e3 100644 --- a/tests/base/stdcxx14_constexpr_min_max.cc +++ b/tests/base/stdcxx14_constexpr_min_max.cc @@ -19,7 +19,7 @@ // the STL. -#include +#include #include "../tests.h" diff --git a/tests/manifold/projection_manifold_01.cc b/tests/manifold/projection_manifold_01.cc index 9188983792..d6141e3cd4 100644 --- a/tests/manifold/projection_manifold_01.cc +++ b/tests/manifold/projection_manifold_01.cc @@ -19,8 +19,6 @@ // all include files you need here -#include - #include #include #include @@ -28,6 +26,9 @@ #include #include +#include + + template class MyManifold : public Manifold { diff --git a/tests/manifold/transfinite_manifold_10.cc b/tests/manifold/transfinite_manifold_10.cc index b410e60f14..5721d9bb2a 100644 --- a/tests/manifold/transfinite_manifold_10.cc +++ b/tests/manifold/transfinite_manifold_10.cc @@ -16,11 +16,11 @@ // This test verifies that the transfinite interpolation works on a torus -#include - #include #include +#include + #include "../tests.h" diff --git a/tests/mappings/mapping_q_convergence.cc b/tests/mappings/mapping_q_convergence.cc index 9b7b98fb42..b915b6b017 100644 --- a/tests/mappings/mapping_q_convergence.cc +++ b/tests/mappings/mapping_q_convergence.cc @@ -15,7 +15,6 @@ #include #include -#include #include @@ -35,6 +34,8 @@ #include +#include + #include "../tests.h" // Test that we achieve the correct rates of convergence with MappingQ when diff --git a/tests/matrix_free/parallel_multigrid_adaptive_07.cc b/tests/matrix_free/parallel_multigrid_adaptive_07.cc index 73f40b5e33..62370ce383 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_07.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_07.cc @@ -22,7 +22,6 @@ // degree used. -#include #include #include @@ -54,6 +53,8 @@ #include +#include + #include "../tests.h" diff --git a/tests/multigrid/renumbering_06.cc b/tests/multigrid/renumbering_06.cc index 8184842e70..3d6648af28 100644 --- a/tests/multigrid/renumbering_06.cc +++ b/tests/multigrid/renumbering_06.cc @@ -20,8 +20,6 @@ // correctly (at the point when this test was written, renumbering that // changes the set of owned dofs is not implemented). -#include - #include #include @@ -35,6 +33,7 @@ #include #include +#include #include "../tests.h" diff --git a/tests/multigrid/renumbering_07.cc b/tests/multigrid/renumbering_07.cc index 9cc221904f..7cf90f359a 100644 --- a/tests/multigrid/renumbering_07.cc +++ b/tests/multigrid/renumbering_07.cc @@ -20,8 +20,6 @@ // Note: This test currently only works in serial and asserts when run with // more than one processor. -#include - #include #include @@ -35,6 +33,7 @@ #include #include +#include #include "../tests.h" diff --git a/tests/parameter_handler/pattern_tools_08.cc b/tests/parameter_handler/pattern_tools_08.cc index 265fcd984f..d2be802027 100644 --- a/tests/parameter_handler/pattern_tools_08.cc +++ b/tests/parameter_handler/pattern_tools_08.cc @@ -16,7 +16,6 @@ // Check Convert::to_pattern() #include -#include #include diff --git a/tests/parameter_handler/pattern_tools_09.cc b/tests/parameter_handler/pattern_tools_09.cc index 04d1b53b0f..fb4dde6a34 100644 --- a/tests/parameter_handler/pattern_tools_09.cc +++ b/tests/parameter_handler/pattern_tools_09.cc @@ -16,7 +16,6 @@ // Check Convert::to_string. #include -#include #include diff --git a/tests/parameter_handler/pattern_tools_10.cc b/tests/parameter_handler/pattern_tools_10.cc index e5b744da56..2b3c76328d 100644 --- a/tests/parameter_handler/pattern_tools_10.cc +++ b/tests/parameter_handler/pattern_tools_10.cc @@ -16,7 +16,6 @@ // Check Convert::to_value. #include -#include #include diff --git a/tests/parameter_handler/pattern_tools_11.cc b/tests/parameter_handler/pattern_tools_11.cc index ea925104c1..aa020d7e56 100644 --- a/tests/parameter_handler/pattern_tools_11.cc +++ b/tests/parameter_handler/pattern_tools_11.cc @@ -17,7 +17,6 @@ // we don't break anything for integral types #include -#include #include #include diff --git a/tests/parameter_handler/pattern_tools_12.cc b/tests/parameter_handler/pattern_tools_12.cc index cd703f270b..ea728f597d 100644 --- a/tests/parameter_handler/pattern_tools_12.cc +++ b/tests/parameter_handler/pattern_tools_12.cc @@ -16,7 +16,6 @@ // Check to_string and to_value #include -#include #include diff --git a/tests/parameter_handler/patterns_08.cc b/tests/parameter_handler/patterns_08.cc index 0251faa8c8..ae37949164 100644 --- a/tests/parameter_handler/patterns_08.cc +++ b/tests/parameter_handler/patterns_08.cc @@ -15,7 +15,6 @@ #include -#include #include diff --git a/tests/parameter_handler/patterns_09.cc b/tests/parameter_handler/patterns_09.cc index b2ecf2fda0..1e81b98c6a 100644 --- a/tests/parameter_handler/patterns_09.cc +++ b/tests/parameter_handler/patterns_09.cc @@ -15,7 +15,6 @@ #include -#include #include diff --git a/tests/parameter_handler/patterns_10.cc b/tests/parameter_handler/patterns_10.cc index 7697930e5c..ffef8cdf35 100644 --- a/tests/parameter_handler/patterns_10.cc +++ b/tests/parameter_handler/patterns_10.cc @@ -15,7 +15,6 @@ #include -#include #include diff --git a/tests/parameter_handler/patterns_11.cc b/tests/parameter_handler/patterns_11.cc index a984dbd900..00a8d0d3c6 100644 --- a/tests/parameter_handler/patterns_11.cc +++ b/tests/parameter_handler/patterns_11.cc @@ -15,7 +15,6 @@ #include -#include #include diff --git a/tests/parameter_handler/patterns_12.cc b/tests/parameter_handler/patterns_12.cc index 9b6d84af8a..9da4650a01 100644 --- a/tests/parameter_handler/patterns_12.cc +++ b/tests/parameter_handler/patterns_12.cc @@ -17,7 +17,6 @@ // and number of PatternStyles. #include -#include #include diff --git a/tests/parameter_handler/patterns_13.cc b/tests/parameter_handler/patterns_13.cc index 4b632629eb..3c962f0563 100644 --- a/tests/parameter_handler/patterns_13.cc +++ b/tests/parameter_handler/patterns_13.cc @@ -16,7 +16,6 @@ // test add_parameters with tuples. #include -#include #include diff --git a/tests/parameter_handler/patterns_14.cc b/tests/parameter_handler/patterns_14.cc index 8f4ad93b7c..668705b56f 100644 --- a/tests/parameter_handler/patterns_14.cc +++ b/tests/parameter_handler/patterns_14.cc @@ -17,7 +17,6 @@ #include #include -#include #include diff --git a/tests/parameter_handler/patterns_15.cc b/tests/parameter_handler/patterns_15.cc index d38328cde1..c30a237b27 100644 --- a/tests/parameter_handler/patterns_15.cc +++ b/tests/parameter_handler/patterns_15.cc @@ -16,7 +16,6 @@ // test add_parameters with ComponentMask. #include -#include #include diff --git a/tests/parameter_handler/patterns_16.cc b/tests/parameter_handler/patterns_16.cc index 945ea2190a..ef75c6192b 100644 --- a/tests/parameter_handler/patterns_16.cc +++ b/tests/parameter_handler/patterns_16.cc @@ -17,7 +17,6 @@ #include #include -#include #include