From 7af80f64ce24d3c01fe829c839b2a47b8b8c329a Mon Sep 17 00:00:00 2001 From: David Wells Date: Wed, 24 Aug 2022 16:18:48 -0400 Subject: [PATCH] Remove unnecessary inclusions of utilities.h. --- include/deal.II/base/bounding_box.h | 1 - include/deal.II/base/parsed_convergence_table.h | 1 - include/deal.II/base/timer.h | 1 - include/deal.II/differentiation/sd/symengine_optimizer.h | 4 +--- include/deal.II/fe/fe_tools_interpolate.templates.h | 1 - include/deal.II/lac/block_indices.h | 6 +++--- include/deal.II/lac/precondition.h | 1 - include/deal.II/lac/read_write_vector.h | 1 - include/deal.II/lac/solver_idr.h | 1 - include/deal.II/lac/trilinos_vector.h | 1 - include/deal.II/matrix_free/face_setup_internal.h | 1 - include/deal.II/matrix_free/matrix_free.templates.h | 1 - include/deal.II/matrix_free/task_info.h | 1 - include/deal.II/numerics/data_out_dof_data.templates.h | 1 - include/deal.II/numerics/fe_field_function.templates.h | 1 - include/deal.II/numerics/point_value_history.h | 1 - include/deal.II/optimization/line_minimization.h | 1 - source/base/parsed_convergence_table.cc | 1 + source/dofs/dof_tools.cc | 4 ++-- 19 files changed, 7 insertions(+), 23 deletions(-) diff --git a/include/deal.II/base/bounding_box.h b/include/deal.II/base/bounding_box.h index 01dd0c0d50..0d30b337a6 100644 --- a/include/deal.II/base/bounding_box.h +++ b/include/deal.II/base/bounding_box.h @@ -21,7 +21,6 @@ #include #include -#include DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/base/parsed_convergence_table.h b/include/deal.II/base/parsed_convergence_table.h index 4d7b6201f8..3150cb7d03 100644 --- a/include/deal.II/base/parsed_convergence_table.h +++ b/include/deal.II/base/parsed_convergence_table.h @@ -23,7 +23,6 @@ #include #include #include -#include #include diff --git a/include/deal.II/base/timer.h b/include/deal.II/base/timer.h index 89d6e7e483..30c9aa50e0 100644 --- a/include/deal.II/base/timer.h +++ b/include/deal.II/base/timer.h @@ -21,7 +21,6 @@ #include #include #include -#include #include #include diff --git a/include/deal.II/differentiation/sd/symengine_optimizer.h b/include/deal.II/differentiation/sd/symengine_optimizer.h index 527ed298a3..1373cc027e 100644 --- a/include/deal.II/differentiation/sd/symengine_optimizer.h +++ b/include/deal.II/differentiation/sd/symengine_optimizer.h @@ -279,9 +279,7 @@ namespace Differentiation s << "cse|"; // LLVM optimization level - s << "-O" + - dealii::Utilities::to_string( - internal::get_LLVM_optimization_level(o)) + + s << "-O" + std::to_string(internal::get_LLVM_optimization_level(o)) + "|"; return s; diff --git a/include/deal.II/fe/fe_tools_interpolate.templates.h b/include/deal.II/fe/fe_tools_interpolate.templates.h index 3c0dd8113f..c3ba8226ba 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/lac/block_indices.h b/include/deal.II/lac/block_indices.h index 8444237e82..1da04d1b46 100644 --- a/include/deal.II/lac/block_indices.h +++ b/include/deal.II/lac/block_indices.h @@ -22,10 +22,10 @@ #include #include #include -#include +#include #include -#include +#include #include DEAL_II_NAMESPACE_OPEN @@ -380,7 +380,7 @@ BlockIndices::block_size(const unsigned int block) const inline std::string BlockIndices::to_string() const { - std::string result = "[" + Utilities::int_to_string(n_blocks) + "->"; + std::string result = "[" + std::to_string(n_blocks) + "->"; for (unsigned int i = 0; i < n_blocks; ++i) { if (i > 0) diff --git a/include/deal.II/lac/precondition.h b/include/deal.II/lac/precondition.h index d5d143a68b..ce47525dce 100644 --- a/include/deal.II/lac/precondition.h +++ b/include/deal.II/lac/precondition.h @@ -24,7 +24,6 @@ #include #include #include -#include #include #include diff --git a/include/deal.II/lac/read_write_vector.h b/include/deal.II/lac/read_write_vector.h index 4af5b1c6b2..d3ec6df772 100644 --- a/include/deal.II/lac/read_write_vector.h +++ b/include/deal.II/lac/read_write_vector.h @@ -26,7 +26,6 @@ #include #include #include -#include #include diff --git a/include/deal.II/lac/solver_idr.h b/include/deal.II/lac/solver_idr.h index 3c6c66daba..1744585e8c 100644 --- a/include/deal.II/lac/solver_idr.h +++ b/include/deal.II/lac/solver_idr.h @@ -22,7 +22,6 @@ #include #include #include -#include #include #include diff --git a/include/deal.II/lac/trilinos_vector.h b/include/deal.II/lac/trilinos_vector.h index 2161e19f2b..36cec8d04f 100644 --- a/include/deal.II/lac/trilinos_vector.h +++ b/include/deal.II/lac/trilinos_vector.h @@ -23,7 +23,6 @@ # include # include # include -# include # include # include diff --git a/include/deal.II/matrix_free/face_setup_internal.h b/include/deal.II/matrix_free/face_setup_internal.h index f715a674be..8704269504 100644 --- a/include/deal.II/matrix_free/face_setup_internal.h +++ b/include/deal.II/matrix_free/face_setup_internal.h @@ -20,7 +20,6 @@ #include #include -#include #include diff --git a/include/deal.II/matrix_free/matrix_free.templates.h b/include/deal.II/matrix_free/matrix_free.templates.h index e0272e9f8e..1b43fc4d03 100644 --- a/include/deal.II/matrix_free/matrix_free.templates.h +++ b/include/deal.II/matrix_free/matrix_free.templates.h @@ -26,7 +26,6 @@ #include #include #include -#include #include diff --git a/include/deal.II/matrix_free/task_info.h b/include/deal.II/matrix_free/task_info.h index 3f89b4a365..1f334b718f 100644 --- a/include/deal.II/matrix_free/task_info.h +++ b/include/deal.II/matrix_free/task_info.h @@ -24,7 +24,6 @@ #include #include #include -#include #include 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 c1af92f0d9..0952f02ba9 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/fe_field_function.templates.h b/include/deal.II/numerics/fe_field_function.templates.h index 2a2c711d9c..3f744a5a66 100644 --- a/include/deal.II/numerics/fe_field_function.templates.h +++ b/include/deal.II/numerics/fe_field_function.templates.h @@ -20,7 +20,6 @@ #include #include -#include #include diff --git a/include/deal.II/numerics/point_value_history.h b/include/deal.II/numerics/point_value_history.h index 42f79c0127..54db549e4a 100644 --- a/include/deal.II/numerics/point_value_history.h +++ b/include/deal.II/numerics/point_value_history.h @@ -23,7 +23,6 @@ #include #include #include -#include #include #include diff --git a/include/deal.II/optimization/line_minimization.h b/include/deal.II/optimization/line_minimization.h index 5bcd9dab8b..ee7e3349c9 100644 --- a/include/deal.II/optimization/line_minimization.h +++ b/include/deal.II/optimization/line_minimization.h @@ -22,7 +22,6 @@ #include #include #include -#include #include diff --git a/source/base/parsed_convergence_table.cc b/source/base/parsed_convergence_table.cc index 607c6b2734..d5835bf3f7 100644 --- a/source/base/parsed_convergence_table.cc +++ b/source/base/parsed_convergence_table.cc @@ -13,6 +13,7 @@ // // --------------------------------------------------------------------- +#include #include #include #include diff --git a/source/dofs/dof_tools.cc b/source/dofs/dof_tools.cc index 2283ff3f25..a5a6908393 100644 --- a/source/dofs/dof_tools.cc +++ b/source/dofs/dof_tools.cc @@ -13,10 +13,10 @@ // // --------------------------------------------------------------------- -#include +#include +#include #include #include -#include #include #include -- 2.39.5