Remove unnecessary inclusions of utilities.h.

diff --git a/include/deal.II/base/bounding_box.h b/include/deal.II/base/bounding_box.h
index 01dd0c0d5011b0307f0cf9488e55cda48be61cbe..0d30b337a6785c3e85ae20622340306306854906 100644 (file)
--- a/include/deal.II/base/bounding_box.h
+++ b/include/deal.II/base/bounding_box.h
@@ -21,7 +21,6 @@
 
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/point.h>
-#include <deal.II/base/utilities.h>
 
 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 4d7b6201f8b9c2033f88413e4c4f9cf2b1d6f4e3..3150cb7d036e8995804d9557889c5bc4c44a6689 100644 (file)
--- a/include/deal.II/base/parsed_convergence_table.h
+++ b/include/deal.II/base/parsed_convergence_table.h
@@ -23,7 +23,6 @@
 #include <deal.II/base/function_parser.h>
 #include <deal.II/base/parameter_handler.h>
 #include <deal.II/base/quadrature_lib.h>
-#include <deal.II/base/utilities.h>
 
 #include <deal.II/dofs/dof_handler.h>
 

diff --git a/include/deal.II/base/timer.h b/include/deal.II/base/timer.h
index 89d6e7e48300d7a8ab6ec4c8813d8473b632182e..30c9aa50e054bfc6c8bb9e3ac9d70121da75bb0d 100644 (file)
--- a/include/deal.II/base/timer.h
+++ b/include/deal.II/base/timer.h
@@ -21,7 +21,6 @@
 #include <deal.II/base/conditional_ostream.h>
 #include <deal.II/base/mpi.h>
 #include <deal.II/base/mutex.h>
-#include <deal.II/base/utilities.h>
 
 #include <chrono>
 #include <list>

diff --git a/include/deal.II/differentiation/sd/symengine_optimizer.h b/include/deal.II/differentiation/sd/symengine_optimizer.h
index 527ed298a37ce15680d53b19486d679cad37964d..1373cc027eba8f27b0c28f4c3692b0f5b73fdbf5 100644 (file)
--- 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 3c0dd8113fdc47c6640e36f082beedfb704f19da..c3ba8226ba67f23cee8a5be1c16d899b0d70b29f 100644 (file)
--- 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 <deal.II/base/index_set.h>
 #include <deal.II/base/qprojector.h>
 #include <deal.II/base/quadrature_lib.h>
-#include <deal.II/base/utilities.h>
 
 #include <deal.II/dofs/dof_accessor.h>
 #include <deal.II/dofs/dof_handler.h>

diff --git a/include/deal.II/lac/block_indices.h b/include/deal.II/lac/block_indices.h
index 8444237e8201926bb21457c9d5dcd1c675a3b65a..1da04d1b461f804733d77c8bae5b16e9dd2e27a8 100644 (file)
--- a/include/deal.II/lac/block_indices.h
+++ b/include/deal.II/lac/block_indices.h
@@ -22,10 +22,10 @@
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/logstream.h>
 #include <deal.II/base/subscriptor.h>
-#include <deal.II/base/utilities.h>
 
+#include <algorithm>
 #include <cstddef>
-#include <iterator>
+#include <string>
 #include <vector>
 
 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 d5d143a68b6258818091991e07df34255ca57aab..ce47525dce961d766c3e04b25a44940d0b6fd833 100644 (file)
--- a/include/deal.II/lac/precondition.h
+++ b/include/deal.II/lac/precondition.h
@@ -24,7 +24,6 @@
 #include <deal.II/base/parallel.h>
 #include <deal.II/base/smartpointer.h>
 #include <deal.II/base/template_constraints.h>
-#include <deal.II/base/utilities.h>
 
 #include <deal.II/lac/affine_constraints.h>
 #include <deal.II/lac/block_vector_base.h>

diff --git a/include/deal.II/lac/read_write_vector.h b/include/deal.II/lac/read_write_vector.h
index 4af5b1c6b27dbb7698eb3d548b3836a6ae579380..d3ec6df7725856515a123de2c25bbfdf4619d42c 100644 (file)
--- a/include/deal.II/lac/read_write_vector.h
+++ b/include/deal.II/lac/read_write_vector.h
@@ -26,7 +26,6 @@
 #include <deal.II/base/subscriptor.h>
 #include <deal.II/base/template_constraints.h>
 #include <deal.II/base/types.h>
-#include <deal.II/base/utilities.h>
 
 #include <deal.II/lac/vector_operation.h>
 

diff --git a/include/deal.II/lac/solver_idr.h b/include/deal.II/lac/solver_idr.h
index 3c6c66daba86d972c9311a13d8c7ae6ec6fe6d96..1744585e8c5272f57e07ad314e1b9a458d696348 100644 (file)
--- a/include/deal.II/lac/solver_idr.h
+++ b/include/deal.II/lac/solver_idr.h
@@ -22,7 +22,6 @@
 #include <deal.II/base/logstream.h>
 #include <deal.II/base/signaling_nan.h>
 #include <deal.II/base/subscriptor.h>
-#include <deal.II/base/utilities.h>
 
 #include <deal.II/lac/block_vector_base.h>
 #include <deal.II/lac/full_matrix.h>

diff --git a/include/deal.II/lac/trilinos_vector.h b/include/deal.II/lac/trilinos_vector.h
index 2161e19f2b756f4efd36feb4e3f974ba0af94eac..36cec8d04f479d586bd9dc99aa8a57080f758c7f 100644 (file)
--- a/include/deal.II/lac/trilinos_vector.h
+++ b/include/deal.II/lac/trilinos_vector.h
@@ -23,7 +23,6 @@
 #  include <deal.II/base/index_set.h>
 #  include <deal.II/base/mpi_stub.h>
 #  include <deal.II/base/subscriptor.h>
-#  include <deal.II/base/utilities.h>
 
 #  include <deal.II/lac/exceptions.h>
 #  include <deal.II/lac/vector.h>

diff --git a/include/deal.II/matrix_free/face_setup_internal.h b/include/deal.II/matrix_free/face_setup_internal.h
index f715a674be2a47b11e5342857323d71187ad5d6c..87042695043efa66be01c8fec0fc956b6370ce7f 100644 (file)
--- 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 <deal.II/base/config.h>
 
 #include <deal.II/base/memory_consumption.h>
-#include <deal.II/base/utilities.h>
 
 #include <deal.II/distributed/tria_base.h>
 

diff --git a/include/deal.II/matrix_free/matrix_free.templates.h b/include/deal.II/matrix_free/matrix_free.templates.h
index e0272e9f8ea047b037a3e78f34e7b65c016bae7e..1b43fc4d036bdbe59d06a44a393573660044e90b 100644 (file)
--- 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 <deal.II/base/polynomials_piecewise.h>
 #include <deal.II/base/quadrature_lib.h>
 #include <deal.II/base/tensor_product_polynomials.h>
-#include <deal.II/base/utilities.h>
 
 #include <deal.II/distributed/tria.h>
 

diff --git a/include/deal.II/matrix_free/task_info.h b/include/deal.II/matrix_free/task_info.h
index 3f89b4a3657d874d10783bec9ae479cdc8e6b657..1f334b718f20f29c197c558032e308abbfd52eaf 100644 (file)
--- a/include/deal.II/matrix_free/task_info.h
+++ b/include/deal.II/matrix_free/task_info.h
@@ -24,7 +24,6 @@
 #include <deal.II/base/memory_consumption.h>
 #include <deal.II/base/mpi_stub.h>
 #include <deal.II/base/tensor.h>
-#include <deal.II/base/utilities.h>
 #include <deal.II/base/vectorization.h>
 
 

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 c1af92f0d99d18c4c6dfd04baafb7dd20c21dd5e..0952f02ba9d138bfb7bd5d0ee9a4b7cab6db2c6d 100644 (file)
--- 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 <deal.II/base/numbers.h>
 #include <deal.II/base/quadrature_lib.h>
 #include <deal.II/base/signaling_nan.h>
-#include <deal.II/base/utilities.h>
 #include <deal.II/base/work_stream.h>
 
 #include <deal.II/dofs/dof_accessor.h>

diff --git a/include/deal.II/numerics/fe_field_function.templates.h b/include/deal.II/numerics/fe_field_function.templates.h
index 2a2c711d9c26e3a58f2ce08a42402390bbe56784..3f744a5a66b8b4d73507d8774e024a1b41be9b7e 100644 (file)
--- 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 <deal.II/base/config.h>
 
 #include <deal.II/base/logstream.h>
-#include <deal.II/base/utilities.h>
 
 #include <deal.II/fe/fe_values.h>
 

diff --git a/include/deal.II/numerics/point_value_history.h b/include/deal.II/numerics/point_value_history.h
index 42f79c0127e5f75801644ffd1b759f17083101f7..54db549e4a0c7e7f09e930406bf3c5d36ef96544 100644 (file)
--- a/include/deal.II/numerics/point_value_history.h
+++ b/include/deal.II/numerics/point_value_history.h
@@ -23,7 +23,6 @@
 #include <deal.II/base/point.h>
 #include <deal.II/base/quadrature_lib.h>
 #include <deal.II/base/smartpointer.h>
-#include <deal.II/base/utilities.h>
 
 #include <deal.II/dofs/dof_accessor.h>
 #include <deal.II/dofs/dof_handler.h>

diff --git a/include/deal.II/optimization/line_minimization.h b/include/deal.II/optimization/line_minimization.h
index 5bcd9dab8baf966c3279df0dc401b8ebd5f6047e..ee7e3349c91c07a5536a26904ff41a58f9e4a95c 100644 (file)
--- a/include/deal.II/optimization/line_minimization.h
+++ b/include/deal.II/optimization/line_minimization.h
@@ -22,7 +22,6 @@
 #include <deal.II/base/logstream.h>
 #include <deal.II/base/numbers.h>
 #include <deal.II/base/std_cxx17/optional.h>
-#include <deal.II/base/utilities.h>
 
 #include <deal.II/numerics/history.h>
 

diff --git a/source/base/parsed_convergence_table.cc b/source/base/parsed_convergence_table.cc
index 607c6b27340779dd74b3773b60b571bc838fc3fb..d5835bf3f787d0795188b6d7be17371239ac749e 100644 (file)
--- a/source/base/parsed_convergence_table.cc
+++ b/source/base/parsed_convergence_table.cc
@@ -13,6 +13,7 @@
 //
 // ---------------------------------------------------------------------
 
+#include <deal.II/base/parameter_handler.h>
 #include <deal.II/base/parsed_convergence_table.h>
 #include <deal.II/base/patterns.h>
 #include <deal.II/base/utilities.h>

diff --git a/source/dofs/dof_tools.cc b/source/dofs/dof_tools.cc
index 2283ff3f2573772349efa368e7d57f21a568d6fc..a5a6908393d7d243608c4869de4e6ff7000b001b 100644 (file)
--- a/source/dofs/dof_tools.cc
+++ b/source/dofs/dof_tools.cc
@@ -13,10 +13,10 @@
 //
 // ---------------------------------------------------------------------
 
-#include <deal.II/base/quadrature_lib.h>
+#include <deal.II/base/mpi.h>
+#include <deal.II/base/quadrature.h>
 #include <deal.II/base/table.h>
 #include <deal.II/base/template_constraints.h>
-#include <deal.II/base/utilities.h>
 
 #include <deal.II/distributed/shared_tria.h>
 #include <deal.II/distributed/tria.h>