From fb9f46eb6c05f3a4aec20b6f6c1ff40fdbd176c7 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Mon, 14 Oct 2024 16:57:16 -0600 Subject: [PATCH] Rename EnableObserverPointer files. --- include/deal.II/algorithms/any_data.h | 2 +- include/deal.II/algorithms/general_data_storage.h | 2 +- include/deal.II/algorithms/timestep_control.h | 2 +- ...unting_by_observer_pointer.h => enable_observer_pointer.h} | 4 ++-- include/deal.II/base/function.h | 2 +- include/deal.II/base/logstream.h | 2 +- include/deal.II/base/mg_level_object.h | 2 +- include/deal.II/base/observer_pointer.h | 2 +- include/deal.II/base/parameter_handler.h | 2 +- include/deal.II/base/patterns.h | 2 +- include/deal.II/base/polynomial.h | 2 +- include/deal.II/base/polynomials_hermite.h | 2 +- include/deal.II/base/polynomials_piecewise.h | 2 +- include/deal.II/base/quadrature.h | 2 +- include/deal.II/base/quadrature_point_data.h | 2 +- include/deal.II/base/subscriptor.h | 2 +- include/deal.II/base/symbolic_function.h | 2 +- include/deal.II/base/table.h | 2 +- include/deal.II/base/tensor_function.h | 2 +- include/deal.II/distributed/shared_tria.h | 2 +- include/deal.II/distributed/tria.h | 2 +- include/deal.II/distributed/tria_base.h | 2 +- include/deal.II/dofs/block_info.h | 2 +- include/deal.II/fe/fe_coupling_values.h | 2 +- include/deal.II/fe/fe_series.h | 2 +- include/deal.II/fe/fe_tools.h | 2 +- include/deal.II/fe/fe_values.h | 2 +- include/deal.II/fe/fe_values_base.h | 2 +- include/deal.II/grid/composition_manifold.h | 2 +- include/deal.II/grid/grid_tools_cache.h | 2 +- include/deal.II/grid/manifold.h | 2 +- include/deal.II/grid/tensor_product_manifold.h | 2 +- include/deal.II/grid/tria.h | 2 +- include/deal.II/hp/collection.h | 2 +- include/deal.II/hp/mapping_collection.h | 2 +- include/deal.II/hp/q_collection.h | 2 +- include/deal.II/lac/affine_constraints.h | 2 +- include/deal.II/lac/block_indices.h | 2 +- include/deal.II/lac/block_sparse_matrix_ez.h | 2 +- include/deal.II/lac/block_sparsity_pattern.h | 2 +- include/deal.II/lac/block_vector_base.h | 2 +- include/deal.II/lac/chunk_sparse_matrix.h | 2 +- include/deal.II/lac/chunk_sparsity_pattern.h | 2 +- include/deal.II/lac/dynamic_sparsity_pattern.h | 2 +- include/deal.II/lac/la_parallel_vector.h | 2 +- include/deal.II/lac/petsc_matrix_base.h | 2 +- include/deal.II/lac/petsc_precondition.h | 2 +- include/deal.II/lac/petsc_vector.h | 2 +- include/deal.II/lac/petsc_vector_base.h | 2 +- include/deal.II/lac/precondition_block.h | 2 +- include/deal.II/lac/precondition_block_base.h | 2 +- include/deal.II/lac/precondition_selector.h | 2 +- include/deal.II/lac/read_write_vector.h | 2 +- include/deal.II/lac/relaxation_block.h | 2 +- include/deal.II/lac/solver.h | 2 +- include/deal.II/lac/solver_bicgstab.h | 2 +- include/deal.II/lac/solver_cg.h | 2 +- include/deal.II/lac/solver_control.h | 2 +- include/deal.II/lac/solver_gmres.h | 2 +- include/deal.II/lac/solver_idr.h | 2 +- include/deal.II/lac/solver_minres.h | 2 +- include/deal.II/lac/solver_qmrs.h | 2 +- include/deal.II/lac/solver_relaxation.h | 2 +- include/deal.II/lac/sparse_direct.h | 2 +- include/deal.II/lac/sparse_matrix.h | 2 +- include/deal.II/lac/sparse_matrix_ez.h | 2 +- include/deal.II/lac/sparsity_pattern.h | 2 +- include/deal.II/lac/sparsity_pattern_base.h | 2 +- include/deal.II/lac/tridiagonal_matrix.h | 2 +- include/deal.II/lac/trilinos_epetra_vector.h | 2 +- include/deal.II/lac/trilinos_precondition.h | 2 +- include/deal.II/lac/trilinos_sparse_matrix.h | 2 +- include/deal.II/lac/trilinos_sparsity_pattern.h | 2 +- include/deal.II/lac/trilinos_tpetra_precondition.h | 2 +- include/deal.II/lac/trilinos_tpetra_sparse_matrix.h | 2 +- include/deal.II/lac/trilinos_tpetra_sparsity_pattern.h | 2 +- include/deal.II/lac/trilinos_tpetra_vector.h | 2 +- include/deal.II/lac/trilinos_vector.h | 2 +- include/deal.II/lac/vector.h | 2 +- include/deal.II/matrix_free/mapping_data_on_the_fly.h | 2 +- include/deal.II/matrix_free/operators.h | 2 +- include/deal.II/meshworker/local_integrator.h | 2 +- include/deal.II/multigrid/mg_base.h | 2 +- include/deal.II/multigrid/mg_constrained_dofs.h | 2 +- include/deal.II/multigrid/multigrid.h | 2 +- include/deal.II/non_matching/immersed_surface_quadrature.h | 2 +- include/deal.II/numerics/data_postprocessor.h | 2 +- include/deal.II/numerics/time_dependent.h | 2 +- include/deal.II/particles/particle_handler.h | 2 +- source/base/CMakeLists.txt | 2 +- ...ref_counting_by_observer.cc => enable_observer_pointer.cc} | 2 +- tests/base/assign_subscriptor.cc | 2 +- tests/base/reference.cc | 2 +- tests/base/smart_pointer_01.cc | 2 +- tests/base/smart_pointer_02.cc | 2 +- tests/base/unsubscribe_subscriptor.cc | 2 +- tests/base/unsubscribe_subscriptor.debug.output | 4 ++-- tests/base/unsubscribe_subscriptor.debug.output.clang-6 | 4 ++-- tests/base/unsubscribe_subscriptor.debug.output.gcc-12 | 4 ++-- tests/base/unsubscribe_subscriptor.debug.output.intel | 4 ++-- tests/base/unsubscribe_subscriptor_01.cc | 2 +- 101 files changed, 106 insertions(+), 106 deletions(-) rename include/deal.II/base/{enable_ref_counting_by_observer_pointer.h => enable_observer_pointer.h} (99%) rename source/base/{enable_ref_counting_by_observer.cc => enable_observer_pointer.cc} (98%) diff --git a/include/deal.II/algorithms/any_data.h b/include/deal.II/algorithms/any_data.h index a3a03afe38..9a20bc7d54 100644 --- a/include/deal.II/algorithms/any_data.h +++ b/include/deal.II/algorithms/any_data.h @@ -17,7 +17,7 @@ #include -#include +#include #include #include diff --git a/include/deal.II/algorithms/general_data_storage.h b/include/deal.II/algorithms/general_data_storage.h index da3fd8d2ee..b8538a77a6 100644 --- a/include/deal.II/algorithms/general_data_storage.h +++ b/include/deal.II/algorithms/general_data_storage.h @@ -17,7 +17,7 @@ #include -#include +#include #include #include diff --git a/include/deal.II/algorithms/timestep_control.h b/include/deal.II/algorithms/timestep_control.h index 676e26c9c8..800d96f480 100644 --- a/include/deal.II/algorithms/timestep_control.h +++ b/include/deal.II/algorithms/timestep_control.h @@ -18,7 +18,7 @@ #include -#include +#include #include #include diff --git a/include/deal.II/base/enable_ref_counting_by_observer_pointer.h b/include/deal.II/base/enable_observer_pointer.h similarity index 99% rename from include/deal.II/base/enable_ref_counting_by_observer_pointer.h rename to include/deal.II/base/enable_observer_pointer.h index 32e250f757..f8cbd4a9e3 100644 --- a/include/deal.II/base/enable_ref_counting_by_observer_pointer.h +++ b/include/deal.II/base/enable_observer_pointer.h @@ -12,8 +12,8 @@ // // ------------------------------------------------------------------------ -#ifndef dealii_enable_ref_counting_by_observer_h -#define dealii_enable_ref_counting_by_observer_h +#ifndef dealii_enable_observer_pointer_h +#define dealii_enable_observer_pointer_h #include diff --git a/include/deal.II/base/function.h b/include/deal.II/base/function.h index 5face6f70c..52c8fcca57 100644 --- a/include/deal.II/base/function.h +++ b/include/deal.II/base/function.h @@ -18,7 +18,7 @@ #include -#include +#include #include #include #include diff --git a/include/deal.II/base/logstream.h b/include/deal.II/base/logstream.h index 68f02aa3bd..9d7efc0314 100644 --- a/include/deal.II/base/logstream.h +++ b/include/deal.II/base/logstream.h @@ -17,7 +17,7 @@ #include -#include +#include #include #include #include diff --git a/include/deal.II/base/mg_level_object.h b/include/deal.II/base/mg_level_object.h index ff11c5e9ec..db0fe4e275 100644 --- a/include/deal.II/base/mg_level_object.h +++ b/include/deal.II/base/mg_level_object.h @@ -17,7 +17,7 @@ #include -#include +#include #include #include diff --git a/include/deal.II/base/observer_pointer.h b/include/deal.II/base/observer_pointer.h index 0386d48936..6cb352c1dc 100644 --- a/include/deal.II/base/observer_pointer.h +++ b/include/deal.II/base/observer_pointer.h @@ -18,7 +18,7 @@ #include -#include +#include #include #include diff --git a/include/deal.II/base/parameter_handler.h b/include/deal.II/base/parameter_handler.h index 78684558fb..8dbb3ff396 100644 --- a/include/deal.II/base/parameter_handler.h +++ b/include/deal.II/base/parameter_handler.h @@ -18,7 +18,7 @@ #include -#include +#include #include #include diff --git a/include/deal.II/base/patterns.h b/include/deal.II/base/patterns.h index 228b6e237a..2300fa183d 100644 --- a/include/deal.II/base/patterns.h +++ b/include/deal.II/base/patterns.h @@ -18,7 +18,7 @@ #include -#include +#include #include #include #include diff --git a/include/deal.II/base/polynomial.h b/include/deal.II/base/polynomial.h index eff924ed45..836d26644a 100644 --- a/include/deal.II/base/polynomial.h +++ b/include/deal.II/base/polynomial.h @@ -19,7 +19,7 @@ #include -#include +#include #include #include diff --git a/include/deal.II/base/polynomials_hermite.h b/include/deal.II/base/polynomials_hermite.h index bdf36583be..7f40ab4253 100644 --- a/include/deal.II/base/polynomials_hermite.h +++ b/include/deal.II/base/polynomials_hermite.h @@ -19,7 +19,7 @@ #include -#include +#include #include #include #include diff --git a/include/deal.II/base/polynomials_piecewise.h b/include/deal.II/base/polynomials_piecewise.h index 150b011015..063cdbb22f 100644 --- a/include/deal.II/base/polynomials_piecewise.h +++ b/include/deal.II/base/polynomials_piecewise.h @@ -19,7 +19,7 @@ #include -#include +#include #include #include #include diff --git a/include/deal.II/base/quadrature.h b/include/deal.II/base/quadrature.h index 25fa249504..7a8b8432bc 100644 --- a/include/deal.II/base/quadrature.h +++ b/include/deal.II/base/quadrature.h @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include diff --git a/include/deal.II/base/quadrature_point_data.h b/include/deal.II/base/quadrature_point_data.h index 5dd88393ff..3a5144b41b 100644 --- a/include/deal.II/base/quadrature_point_data.h +++ b/include/deal.II/base/quadrature_point_data.h @@ -17,7 +17,7 @@ #include -#include +#include #include #include diff --git a/include/deal.II/base/subscriptor.h b/include/deal.II/base/subscriptor.h index 17d4d6cdb7..3f383f9f64 100644 --- a/include/deal.II/base/subscriptor.h +++ b/include/deal.II/base/subscriptor.h @@ -18,6 +18,6 @@ #include -#include +#include #endif diff --git a/include/deal.II/base/symbolic_function.h b/include/deal.II/base/symbolic_function.h index b4d42f6bbb..2e816605dd 100644 --- a/include/deal.II/base/symbolic_function.h +++ b/include/deal.II/base/symbolic_function.h @@ -17,7 +17,7 @@ #include -#include +#include #include #include #include diff --git a/include/deal.II/base/table.h b/include/deal.II/base/table.h index e9bda5dc47..8d755f0860 100644 --- a/include/deal.II/base/table.h +++ b/include/deal.II/base/table.h @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include diff --git a/include/deal.II/base/tensor_function.h b/include/deal.II/base/tensor_function.h index 5a8b927643..39ef90d8fc 100644 --- a/include/deal.II/base/tensor_function.h +++ b/include/deal.II/base/tensor_function.h @@ -18,7 +18,7 @@ #include -#include +#include #include #include #include diff --git a/include/deal.II/distributed/shared_tria.h b/include/deal.II/distributed/shared_tria.h index ab9c71432f..47d17b8b7a 100644 --- a/include/deal.II/distributed/shared_tria.h +++ b/include/deal.II/distributed/shared_tria.h @@ -18,7 +18,7 @@ #include -#include +#include #include #include #include diff --git a/include/deal.II/distributed/tria.h b/include/deal.II/distributed/tria.h index 81f22ef030..a192c66f82 100644 --- a/include/deal.II/distributed/tria.h +++ b/include/deal.II/distributed/tria.h @@ -18,7 +18,7 @@ #include -#include +#include #include #include #include diff --git a/include/deal.II/distributed/tria_base.h b/include/deal.II/distributed/tria_base.h index 238fdb0a8e..6bacae5666 100644 --- a/include/deal.II/distributed/tria_base.h +++ b/include/deal.II/distributed/tria_base.h @@ -18,7 +18,7 @@ #include -#include +#include #include #include #include diff --git a/include/deal.II/dofs/block_info.h b/include/deal.II/dofs/block_info.h index ac02189781..f6506e9c0b 100644 --- a/include/deal.II/dofs/block_info.h +++ b/include/deal.II/dofs/block_info.h @@ -17,7 +17,7 @@ #include -#include +#include #include #include diff --git a/include/deal.II/fe/fe_coupling_values.h b/include/deal.II/fe/fe_coupling_values.h index 53520d5980..7b2e300fe1 100644 --- a/include/deal.II/fe/fe_coupling_values.h +++ b/include/deal.II/fe/fe_coupling_values.h @@ -20,7 +20,7 @@ #include -#include +#include #include #include #include diff --git a/include/deal.II/fe/fe_series.h b/include/deal.II/fe/fe_series.h index 8aa5d6b690..6016387a56 100644 --- a/include/deal.II/fe/fe_series.h +++ b/include/deal.II/fe/fe_series.h @@ -19,7 +19,7 @@ #include -#include +#include #include #include #include diff --git a/include/deal.II/fe/fe_tools.h b/include/deal.II/fe/fe_tools.h index e32dbe0697..ea447a2392 100644 --- a/include/deal.II/fe/fe_tools.h +++ b/include/deal.II/fe/fe_tools.h @@ -19,7 +19,7 @@ #include -#include +#include #include #include #include diff --git a/include/deal.II/fe/fe_values.h b/include/deal.II/fe/fe_values.h index 9a77d94f3a..142bcde125 100644 --- a/include/deal.II/fe/fe_values.h +++ b/include/deal.II/fe/fe_values.h @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/include/deal.II/fe/fe_values_base.h b/include/deal.II/fe/fe_values_base.h index b938fffc05..6d70abcf37 100644 --- a/include/deal.II/fe/fe_values_base.h +++ b/include/deal.II/fe/fe_values_base.h @@ -19,7 +19,7 @@ #include #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 e20427a68f..b903472286 100644 --- a/include/deal.II/grid/composition_manifold.h +++ b/include/deal.II/grid/composition_manifold.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/include/deal.II/grid/grid_tools_cache.h b/include/deal.II/grid/grid_tools_cache.h index f1f21613c7..c2b79f09de 100644 --- a/include/deal.II/grid/grid_tools_cache.h +++ b/include/deal.II/grid/grid_tools_cache.h @@ -18,7 +18,7 @@ #include -#include +#include #include #include diff --git a/include/deal.II/grid/manifold.h b/include/deal.II/grid/manifold.h index 644f1ae7d7..74563eefc8 100644 --- a/include/deal.II/grid/manifold.h +++ b/include/deal.II/grid/manifold.h @@ -22,7 +22,7 @@ #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 eb08d7e58e..f4bffedd58 100644 --- a/include/deal.II/grid/tensor_product_manifold.h +++ b/include/deal.II/grid/tensor_product_manifold.h @@ -17,7 +17,7 @@ #include -#include +#include #include #include diff --git a/include/deal.II/grid/tria.h b/include/deal.II/grid/tria.h index bab4b37b65..ee370b57df 100644 --- a/include/deal.II/grid/tria.h +++ b/include/deal.II/grid/tria.h @@ -18,7 +18,7 @@ #include -#include +#include #include #include #include diff --git a/include/deal.II/hp/collection.h b/include/deal.II/hp/collection.h index 985f252257..b21e085a01 100644 --- a/include/deal.II/hp/collection.h +++ b/include/deal.II/hp/collection.h @@ -17,7 +17,7 @@ #include -#include +#include #include #include diff --git a/include/deal.II/hp/mapping_collection.h b/include/deal.II/hp/mapping_collection.h index 67d853ec10..c88fd9f1c6 100644 --- a/include/deal.II/hp/mapping_collection.h +++ b/include/deal.II/hp/mapping_collection.h @@ -17,7 +17,7 @@ #include -#include +#include #include #include diff --git a/include/deal.II/hp/q_collection.h b/include/deal.II/hp/q_collection.h index f4c5c01a0d..b6d315ed9f 100644 --- a/include/deal.II/hp/q_collection.h +++ b/include/deal.II/hp/q_collection.h @@ -17,7 +17,7 @@ #include -#include +#include #include #include diff --git a/include/deal.II/lac/affine_constraints.h b/include/deal.II/lac/affine_constraints.h index 43d2802576..5d571adecf 100644 --- a/include/deal.II/lac/affine_constraints.h +++ b/include/deal.II/lac/affine_constraints.h @@ -17,7 +17,7 @@ #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 d7ebf02f16..0aa24de7ba 100644 --- a/include/deal.II/lac/block_indices.h +++ b/include/deal.II/lac/block_indices.h @@ -18,7 +18,7 @@ #include -#include +#include #include #include diff --git a/include/deal.II/lac/block_sparse_matrix_ez.h b/include/deal.II/lac/block_sparse_matrix_ez.h index 1d7a7aa52e..c80494a39d 100644 --- a/include/deal.II/lac/block_sparse_matrix_ez.h +++ b/include/deal.II/lac/block_sparse_matrix_ez.h @@ -23,7 +23,7 @@ #include -#include +#include #include #include #include diff --git a/include/deal.II/lac/block_sparsity_pattern.h b/include/deal.II/lac/block_sparsity_pattern.h index 55c6b37bb7..72615e8b30 100644 --- a/include/deal.II/lac/block_sparsity_pattern.h +++ b/include/deal.II/lac/block_sparsity_pattern.h @@ -18,7 +18,7 @@ #include -#include +#include #include #include #include diff --git a/include/deal.II/lac/block_vector_base.h b/include/deal.II/lac/block_vector_base.h index a4c848d9df..69d69db3f7 100644 --- a/include/deal.II/lac/block_vector_base.h +++ b/include/deal.II/lac/block_vector_base.h @@ -18,7 +18,7 @@ #include -#include +#include #include #include #include diff --git a/include/deal.II/lac/chunk_sparse_matrix.h b/include/deal.II/lac/chunk_sparse_matrix.h index 62d7177093..ef7402f785 100644 --- a/include/deal.II/lac/chunk_sparse_matrix.h +++ b/include/deal.II/lac/chunk_sparse_matrix.h @@ -18,7 +18,7 @@ #include -#include +#include #include #include diff --git a/include/deal.II/lac/chunk_sparsity_pattern.h b/include/deal.II/lac/chunk_sparsity_pattern.h index ac78820adb..312032b675 100644 --- a/include/deal.II/lac/chunk_sparsity_pattern.h +++ b/include/deal.II/lac/chunk_sparsity_pattern.h @@ -18,7 +18,7 @@ #include -#include +#include #include #include diff --git a/include/deal.II/lac/dynamic_sparsity_pattern.h b/include/deal.II/lac/dynamic_sparsity_pattern.h index 908ed30ff9..adffb50148 100644 --- a/include/deal.II/lac/dynamic_sparsity_pattern.h +++ b/include/deal.II/lac/dynamic_sparsity_pattern.h @@ -18,7 +18,7 @@ #include -#include +#include #include #include diff --git a/include/deal.II/lac/la_parallel_vector.h b/include/deal.II/lac/la_parallel_vector.h index 9570c17748..3d69c99348 100644 --- a/include/deal.II/lac/la_parallel_vector.h +++ b/include/deal.II/lac/la_parallel_vector.h @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include diff --git a/include/deal.II/lac/petsc_matrix_base.h b/include/deal.II/lac/petsc_matrix_base.h index 190582715b..c4b116978e 100644 --- a/include/deal.II/lac/petsc_matrix_base.h +++ b/include/deal.II/lac/petsc_matrix_base.h @@ -20,7 +20,7 @@ #ifdef DEAL_II_WITH_PETSC -# include +# include # include # include diff --git a/include/deal.II/lac/petsc_precondition.h b/include/deal.II/lac/petsc_precondition.h index 969fe3ea3f..9d5e117be8 100644 --- a/include/deal.II/lac/petsc_precondition.h +++ b/include/deal.II/lac/petsc_precondition.h @@ -18,7 +18,7 @@ #include -#include +#include #include #ifdef DEAL_II_WITH_PETSC diff --git a/include/deal.II/lac/petsc_vector.h b/include/deal.II/lac/petsc_vector.h index 591f04b3ac..c304592548 100644 --- a/include/deal.II/lac/petsc_vector.h +++ b/include/deal.II/lac/petsc_vector.h @@ -20,7 +20,7 @@ #ifdef DEAL_II_WITH_PETSC -# include +# include # include # include diff --git a/include/deal.II/lac/petsc_vector_base.h b/include/deal.II/lac/petsc_vector_base.h index 5798b44edc..fb980744b8 100644 --- a/include/deal.II/lac/petsc_vector_base.h +++ b/include/deal.II/lac/petsc_vector_base.h @@ -20,7 +20,7 @@ #ifdef DEAL_II_WITH_PETSC -# include +# include # include # include diff --git a/include/deal.II/lac/precondition_block.h b/include/deal.II/lac/precondition_block.h index 138bf6846f..17b39d5e2c 100644 --- a/include/deal.II/lac/precondition_block.h +++ b/include/deal.II/lac/precondition_block.h @@ -18,7 +18,7 @@ #include -#include +#include #include #include diff --git a/include/deal.II/lac/precondition_block_base.h b/include/deal.II/lac/precondition_block_base.h index 5e89816e72..067740a998 100644 --- a/include/deal.II/lac/precondition_block_base.h +++ b/include/deal.II/lac/precondition_block_base.h @@ -18,7 +18,7 @@ #include -#include +#include #include #include #include diff --git a/include/deal.II/lac/precondition_selector.h b/include/deal.II/lac/precondition_selector.h index e6c7e86a0e..b49cda2158 100644 --- a/include/deal.II/lac/precondition_selector.h +++ b/include/deal.II/lac/precondition_selector.h @@ -18,7 +18,7 @@ #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 a6cd5b885e..dd6865e69d 100644 --- a/include/deal.II/lac/read_write_vector.h +++ b/include/deal.II/lac/read_write_vector.h @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/include/deal.II/lac/relaxation_block.h b/include/deal.II/lac/relaxation_block.h index 76987dfc76..23774cb192 100644 --- a/include/deal.II/lac/relaxation_block.h +++ b/include/deal.II/lac/relaxation_block.h @@ -17,7 +17,7 @@ #include -#include +#include #include #include diff --git a/include/deal.II/lac/solver.h b/include/deal.II/lac/solver.h index 285499d755..f055bf321c 100644 --- a/include/deal.II/lac/solver.h +++ b/include/deal.II/lac/solver.h @@ -17,7 +17,7 @@ #include -#include +#include #include #include diff --git a/include/deal.II/lac/solver_bicgstab.h b/include/deal.II/lac/solver_bicgstab.h index 32093f9765..07a0f95ef6 100644 --- a/include/deal.II/lac/solver_bicgstab.h +++ b/include/deal.II/lac/solver_bicgstab.h @@ -18,7 +18,7 @@ #include -#include +#include #include #include #include diff --git a/include/deal.II/lac/solver_cg.h b/include/deal.II/lac/solver_cg.h index d92619dc7b..1a3b68568f 100644 --- a/include/deal.II/lac/solver_cg.h +++ b/include/deal.II/lac/solver_cg.h @@ -18,7 +18,7 @@ #include -#include +#include #include #include #include diff --git a/include/deal.II/lac/solver_control.h b/include/deal.II/lac/solver_control.h index 01308b9744..d93bb5d44c 100644 --- a/include/deal.II/lac/solver_control.h +++ b/include/deal.II/lac/solver_control.h @@ -18,7 +18,7 @@ #include -#include +#include #include diff --git a/include/deal.II/lac/solver_gmres.h b/include/deal.II/lac/solver_gmres.h index f1d0e5a89f..c6d74e269e 100644 --- a/include/deal.II/lac/solver_gmres.h +++ b/include/deal.II/lac/solver_gmres.h @@ -19,7 +19,7 @@ #include -#include +#include #include #include diff --git a/include/deal.II/lac/solver_idr.h b/include/deal.II/lac/solver_idr.h index f6ce9af1c1..20dc1fac06 100644 --- a/include/deal.II/lac/solver_idr.h +++ b/include/deal.II/lac/solver_idr.h @@ -18,7 +18,7 @@ #include -#include +#include #include #include #include diff --git a/include/deal.II/lac/solver_minres.h b/include/deal.II/lac/solver_minres.h index 2ae06d072d..a2340082e7 100644 --- a/include/deal.II/lac/solver_minres.h +++ b/include/deal.II/lac/solver_minres.h @@ -18,7 +18,7 @@ #include -#include +#include #include #include #include diff --git a/include/deal.II/lac/solver_qmrs.h b/include/deal.II/lac/solver_qmrs.h index 121ac0db2e..5ece207412 100644 --- a/include/deal.II/lac/solver_qmrs.h +++ b/include/deal.II/lac/solver_qmrs.h @@ -17,7 +17,7 @@ #include -#include +#include #include #include diff --git a/include/deal.II/lac/solver_relaxation.h b/include/deal.II/lac/solver_relaxation.h index 20b2e33733..c394e1bb83 100644 --- a/include/deal.II/lac/solver_relaxation.h +++ b/include/deal.II/lac/solver_relaxation.h @@ -18,7 +18,7 @@ #include -#include +#include #include #include diff --git a/include/deal.II/lac/sparse_direct.h b/include/deal.II/lac/sparse_direct.h index 29e9b1a917..8c2d482538 100644 --- a/include/deal.II/lac/sparse_direct.h +++ b/include/deal.II/lac/sparse_direct.h @@ -18,7 +18,7 @@ #include -#include +#include #include #include diff --git a/include/deal.II/lac/sparse_matrix.h b/include/deal.II/lac/sparse_matrix.h index 6d7ac5d93f..47779962a0 100644 --- a/include/deal.II/lac/sparse_matrix.h +++ b/include/deal.II/lac/sparse_matrix.h @@ -17,7 +17,7 @@ #include -#include +#include #include #include diff --git a/include/deal.II/lac/sparse_matrix_ez.h b/include/deal.II/lac/sparse_matrix_ez.h index 6d6d9a3232..933f584959 100644 --- a/include/deal.II/lac/sparse_matrix_ez.h +++ b/include/deal.II/lac/sparse_matrix_ez.h @@ -18,7 +18,7 @@ #include -#include +#include #include #include diff --git a/include/deal.II/lac/sparsity_pattern.h b/include/deal.II/lac/sparsity_pattern.h index 39e11353ef..485af6a966 100644 --- a/include/deal.II/lac/sparsity_pattern.h +++ b/include/deal.II/lac/sparsity_pattern.h @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include diff --git a/include/deal.II/lac/sparsity_pattern_base.h b/include/deal.II/lac/sparsity_pattern_base.h index 75effad791..5d1b322544 100644 --- a/include/deal.II/lac/sparsity_pattern_base.h +++ b/include/deal.II/lac/sparsity_pattern_base.h @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include diff --git a/include/deal.II/lac/tridiagonal_matrix.h b/include/deal.II/lac/tridiagonal_matrix.h index d52098f204..277a7d98ec 100644 --- a/include/deal.II/lac/tridiagonal_matrix.h +++ b/include/deal.II/lac/tridiagonal_matrix.h @@ -17,7 +17,7 @@ #include -#include +#include #include diff --git a/include/deal.II/lac/trilinos_epetra_vector.h b/include/deal.II/lac/trilinos_epetra_vector.h index 78212ddb0f..abb0165287 100644 --- a/include/deal.II/lac/trilinos_epetra_vector.h +++ b/include/deal.II/lac/trilinos_epetra_vector.h @@ -20,7 +20,7 @@ #ifdef DEAL_II_WITH_TRILINOS -# include +# include # include # include diff --git a/include/deal.II/lac/trilinos_precondition.h b/include/deal.II/lac/trilinos_precondition.h index 7e0f2344a9..9e55ce8830 100644 --- a/include/deal.II/lac/trilinos_precondition.h +++ b/include/deal.II/lac/trilinos_precondition.h @@ -20,7 +20,7 @@ #ifdef DEAL_II_WITH_TRILINOS -# include +# include # include # include diff --git a/include/deal.II/lac/trilinos_sparse_matrix.h b/include/deal.II/lac/trilinos_sparse_matrix.h index 8e05a1433c..b4dbf23213 100644 --- a/include/deal.II/lac/trilinos_sparse_matrix.h +++ b/include/deal.II/lac/trilinos_sparse_matrix.h @@ -20,7 +20,7 @@ # ifdef DEAL_II_WITH_TRILINOS -# include +# include # include # include diff --git a/include/deal.II/lac/trilinos_sparsity_pattern.h b/include/deal.II/lac/trilinos_sparsity_pattern.h index 2809ad980e..96225f98e7 100644 --- a/include/deal.II/lac/trilinos_sparsity_pattern.h +++ b/include/deal.II/lac/trilinos_sparsity_pattern.h @@ -19,7 +19,7 @@ #ifdef DEAL_II_WITH_TRILINOS -# include +# include # include # include # include diff --git a/include/deal.II/lac/trilinos_tpetra_precondition.h b/include/deal.II/lac/trilinos_tpetra_precondition.h index 19d4721429..76b3aa5f3a 100644 --- a/include/deal.II/lac/trilinos_tpetra_precondition.h +++ b/include/deal.II/lac/trilinos_tpetra_precondition.h @@ -28,7 +28,7 @@ #ifdef DEAL_II_TRILINOS_WITH_TPETRA -# include +# include # include # include diff --git a/include/deal.II/lac/trilinos_tpetra_sparse_matrix.h b/include/deal.II/lac/trilinos_tpetra_sparse_matrix.h index 1e6af0de7c..a8587ec021 100644 --- a/include/deal.II/lac/trilinos_tpetra_sparse_matrix.h +++ b/include/deal.II/lac/trilinos_tpetra_sparse_matrix.h @@ -19,7 +19,7 @@ #ifdef DEAL_II_TRILINOS_WITH_TPETRA -# include +# include # include # include diff --git a/include/deal.II/lac/trilinos_tpetra_sparsity_pattern.h b/include/deal.II/lac/trilinos_tpetra_sparsity_pattern.h index 18a84c1a86..8de6def214 100644 --- a/include/deal.II/lac/trilinos_tpetra_sparsity_pattern.h +++ b/include/deal.II/lac/trilinos_tpetra_sparsity_pattern.h @@ -23,7 +23,7 @@ #ifdef DEAL_II_TRILINOS_WITH_TPETRA -# include +# include # include # include diff --git a/include/deal.II/lac/trilinos_tpetra_vector.h b/include/deal.II/lac/trilinos_tpetra_vector.h index f5e5c89d92..9161ee191f 100644 --- a/include/deal.II/lac/trilinos_tpetra_vector.h +++ b/include/deal.II/lac/trilinos_tpetra_vector.h @@ -24,7 +24,7 @@ #ifdef DEAL_II_TRILINOS_WITH_TPETRA -# include +# include # include # include diff --git a/include/deal.II/lac/trilinos_vector.h b/include/deal.II/lac/trilinos_vector.h index 459b6d3b38..708ef61e4c 100644 --- a/include/deal.II/lac/trilinos_vector.h +++ b/include/deal.II/lac/trilinos_vector.h @@ -19,7 +19,7 @@ #include #ifdef DEAL_II_WITH_TRILINOS -# include +# include # include # include # include diff --git a/include/deal.II/lac/vector.h b/include/deal.II/lac/vector.h index 7723b3f8fb..48aa1cd8ba 100644 --- a/include/deal.II/lac/vector.h +++ b/include/deal.II/lac/vector.h @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/include/deal.II/matrix_free/mapping_data_on_the_fly.h b/include/deal.II/matrix_free/mapping_data_on_the_fly.h index 54ef0833f5..9d7ab4e6d0 100644 --- a/include/deal.II/matrix_free/mapping_data_on_the_fly.h +++ b/include/deal.II/matrix_free/mapping_data_on_the_fly.h @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include diff --git a/include/deal.II/matrix_free/operators.h b/include/deal.II/matrix_free/operators.h index 29bb9497d5..7e2a209646 100644 --- a/include/deal.II/matrix_free/operators.h +++ b/include/deal.II/matrix_free/operators.h @@ -19,7 +19,7 @@ #include -#include +#include #include #include diff --git a/include/deal.II/meshworker/local_integrator.h b/include/deal.II/meshworker/local_integrator.h index 31e4864c55..4e83c8c56d 100644 --- a/include/deal.II/meshworker/local_integrator.h +++ b/include/deal.II/meshworker/local_integrator.h @@ -18,7 +18,7 @@ #include -#include +#include #include #include diff --git a/include/deal.II/multigrid/mg_base.h b/include/deal.II/multigrid/mg_base.h index 21f21357fd..65b1d425c3 100644 --- a/include/deal.II/multigrid/mg_base.h +++ b/include/deal.II/multigrid/mg_base.h @@ -22,7 +22,7 @@ #include -#include +#include #include #include diff --git a/include/deal.II/multigrid/mg_constrained_dofs.h b/include/deal.II/multigrid/mg_constrained_dofs.h index e9b2bc2264..ebe5c84114 100644 --- a/include/deal.II/multigrid/mg_constrained_dofs.h +++ b/include/deal.II/multigrid/mg_constrained_dofs.h @@ -17,7 +17,7 @@ #include -#include +#include #include #include diff --git a/include/deal.II/multigrid/multigrid.h b/include/deal.II/multigrid/multigrid.h index 1a362d6df9..6bd55bee16 100644 --- a/include/deal.II/multigrid/multigrid.h +++ b/include/deal.II/multigrid/multigrid.h @@ -18,7 +18,7 @@ #include -#include +#include #include #include diff --git a/include/deal.II/non_matching/immersed_surface_quadrature.h b/include/deal.II/non_matching/immersed_surface_quadrature.h index 4983f70765..f260c83fe5 100644 --- a/include/deal.II/non_matching/immersed_surface_quadrature.h +++ b/include/deal.II/non_matching/immersed_surface_quadrature.h @@ -17,7 +17,7 @@ #include -#include +#include #include #include #include diff --git a/include/deal.II/numerics/data_postprocessor.h b/include/deal.II/numerics/data_postprocessor.h index e6d7429d25..d077755b9c 100644 --- a/include/deal.II/numerics/data_postprocessor.h +++ b/include/deal.II/numerics/data_postprocessor.h @@ -19,7 +19,7 @@ #include -#include +#include #include #include diff --git a/include/deal.II/numerics/time_dependent.h b/include/deal.II/numerics/time_dependent.h index 983fc4f32b..7ddb0e6976 100644 --- a/include/deal.II/numerics/time_dependent.h +++ b/include/deal.II/numerics/time_dependent.h @@ -18,7 +18,7 @@ #include -#include +#include #include #include #include diff --git a/include/deal.II/particles/particle_handler.h b/include/deal.II/particles/particle_handler.h index 1f94d4b428..351e9196b9 100644 --- a/include/deal.II/particles/particle_handler.h +++ b/include/deal.II/particles/particle_handler.h @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include diff --git a/source/base/CMakeLists.txt b/source/base/CMakeLists.txt index cbc0c82c65..1b40cf626e 100644 --- a/source/base/CMakeLists.txt +++ b/source/base/CMakeLists.txt @@ -23,7 +23,7 @@ set(_unity_include_src conditional_ostream.cc convergence_table.cc discrete_time.cc - enable_ref_counting_by_observer.cc + enable_observer_pointer.cc event.cc exceptions.cc flow_function.cc diff --git a/source/base/enable_ref_counting_by_observer.cc b/source/base/enable_observer_pointer.cc similarity index 98% rename from source/base/enable_ref_counting_by_observer.cc rename to source/base/enable_observer_pointer.cc index 67984b99fd..4360970748 100644 --- a/source/base/enable_ref_counting_by_observer.cc +++ b/source/base/enable_observer_pointer.cc @@ -12,7 +12,7 @@ // // ------------------------------------------------------------------------ -#include +#include #include #include diff --git a/tests/base/assign_subscriptor.cc b/tests/base/assign_subscriptor.cc index 4a017416de..df84f1aebb 100644 --- a/tests/base/assign_subscriptor.cc +++ b/tests/base/assign_subscriptor.cc @@ -18,7 +18,7 @@ // pair for copy and move semantics. -#include +#include #include #include diff --git a/tests/base/reference.cc b/tests/base/reference.cc index 0c889ed98c..bd10824143 100644 --- a/tests/base/reference.cc +++ b/tests/base/reference.cc @@ -19,7 +19,7 @@ // other tests. -#include +#include #include #include diff --git a/tests/base/smart_pointer_01.cc b/tests/base/smart_pointer_01.cc index b05f106525..7288fefd4b 100644 --- a/tests/base/smart_pointer_01.cc +++ b/tests/base/smart_pointer_01.cc @@ -18,7 +18,7 @@ // std::any object. -#include +#include #include #include diff --git a/tests/base/smart_pointer_02.cc b/tests/base/smart_pointer_02.cc index 7a998648ed..9701ea7c8a 100644 --- a/tests/base/smart_pointer_02.cc +++ b/tests/base/smart_pointer_02.cc @@ -18,7 +18,7 @@ // available after the renaming to ObserverPointer. -#include +#include #include #include diff --git a/tests/base/unsubscribe_subscriptor.cc b/tests/base/unsubscribe_subscriptor.cc index 880d9f167c..a454c4e14d 100644 --- a/tests/base/unsubscribe_subscriptor.cc +++ b/tests/base/unsubscribe_subscriptor.cc @@ -17,7 +17,7 @@ // check that unsubscribing with a wrong id is handled correctly -#include +#include #include #include diff --git a/tests/base/unsubscribe_subscriptor.debug.output b/tests/base/unsubscribe_subscriptor.debug.output index 249be17af7..3afe48c72b 100644 --- a/tests/base/unsubscribe_subscriptor.debug.output +++ b/tests/base/unsubscribe_subscriptor.debug.output @@ -2,7 +2,7 @@ DEAL::Exception: ExcNoSubscriber(object_info->name(), name) DEAL:: -------------------------------------------------------- -An error occurred in file in function +An error occurred in file in function void dealii::EnableObserverPointer::unsubscribe(std::atomic*, const string&) const The violated condition was: it != counter_map.end() @@ -15,7 +15,7 @@ Additional information: DEAL::Exception: ExcMessage( "This EnableObserverPointer object does not know anything about the supplied pointer!") DEAL:: -------------------------------------------------------- -An error occurred in file in function +An error occurred in file in function void dealii::EnableObserverPointer::unsubscribe(std::atomic*, const string&) const The violated condition was: validity_ptr_it != validity_pointers.end() diff --git a/tests/base/unsubscribe_subscriptor.debug.output.clang-6 b/tests/base/unsubscribe_subscriptor.debug.output.clang-6 index b98b7259b9..7644777cb6 100644 --- a/tests/base/unsubscribe_subscriptor.debug.output.clang-6 +++ b/tests/base/unsubscribe_subscriptor.debug.output.clang-6 @@ -2,7 +2,7 @@ DEAL::Exception: ExcNoSubscriber(object_info->name(), name) DEAL:: -------------------------------------------------------- -An error occurred in file in function +An error occurred in file in function void dealii::EnableObserverPointer::unsubscribe(std::atomic *const, const std::string &) const The violated condition was: it != counter_map.end() @@ -15,7 +15,7 @@ Additional information: DEAL::Exception: ExcMessage( "This EnableObserverPointer object does not know anything about the supplied pointer!") DEAL:: -------------------------------------------------------- -An error occurred in file in function +An error occurred in file in function void dealii::EnableObserverPointer::unsubscribe(std::atomic *const, const std::string &) const The violated condition was: validity_ptr_it != validity_pointers.end() diff --git a/tests/base/unsubscribe_subscriptor.debug.output.gcc-12 b/tests/base/unsubscribe_subscriptor.debug.output.gcc-12 index 013cba366d..6b6890a683 100644 --- a/tests/base/unsubscribe_subscriptor.debug.output.gcc-12 +++ b/tests/base/unsubscribe_subscriptor.debug.output.gcc-12 @@ -2,7 +2,7 @@ DEAL::Exception: ExcNoSubscriber(object_info->name(), name) DEAL:: -------------------------------------------------------- -An error occurred in file in function +An error occurred in file in function void dealii::EnableObserverPointer::unsubscribe(std::atomic*, const std::string&) const The violated condition was: it != counter_map.end() @@ -15,7 +15,7 @@ Additional information: DEAL::Exception: ExcMessage( "This EnableObserverPointer object does not know anything about the supplied pointer!") DEAL:: -------------------------------------------------------- -An error occurred in file in function +An error occurred in file in function void dealii::EnableObserverPointer::unsubscribe(std::atomic*, const std::string&) const The violated condition was: validity_ptr_it != validity_pointers.end() diff --git a/tests/base/unsubscribe_subscriptor.debug.output.intel b/tests/base/unsubscribe_subscriptor.debug.output.intel index 27d7542855..b2966668cf 100644 --- a/tests/base/unsubscribe_subscriptor.debug.output.intel +++ b/tests/base/unsubscribe_subscriptor.debug.output.intel @@ -2,7 +2,7 @@ DEAL::Exception: ExcNoSubscriber(object_info->name(), name) DEAL:: -------------------------------------------------------- -An error occurred in file in function +An error occurred in file in function void dealii::EnableObserverPointer::unsubscribe(std::atomic *, const std::__cxx11::basic_string, std::allocator> &) const The violated condition was: it != counter_map.end() @@ -15,7 +15,7 @@ Additional information: DEAL::Exception: ExcMessage( "This EnableObserverPointer object does not know anything about the supplied pointer!") DEAL:: -------------------------------------------------------- -An error occurred in file in function +An error occurred in file in function void dealii::EnableObserverPointer::unsubscribe(std::atomic *, const std::__cxx11::basic_string, std::allocator> &) const The violated condition was: validity_ptr_it != validity_pointers.end() diff --git a/tests/base/unsubscribe_subscriptor_01.cc b/tests/base/unsubscribe_subscriptor_01.cc index 0a4e4a03bc..3df6a2f77a 100644 --- a/tests/base/unsubscribe_subscriptor_01.cc +++ b/tests/base/unsubscribe_subscriptor_01.cc @@ -19,7 +19,7 @@ // works as well -#include +#include #include #include -- 2.39.5