Rename EnableObserverPointer files.

diff --git a/include/deal.II/algorithms/any_data.h b/include/deal.II/algorithms/any_data.h
index a3a03afe381dc0de5600078a0fb78d84ffb5f599..9a20bc7d54549f96d7f5fa19b28079f87ca27249 100644 (file)
--- a/include/deal.II/algorithms/any_data.h
+++ b/include/deal.II/algorithms/any_data.h
@@ -17,7 +17,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 
 #include <algorithm>

diff --git a/include/deal.II/algorithms/general_data_storage.h b/include/deal.II/algorithms/general_data_storage.h
index da3fd8d2ee7447fd10e7113bc746a9de83dfb862..b8538a77a6d58409f2bafe427e9ccc50777ff5bb 100644 (file)
--- a/include/deal.II/algorithms/general_data_storage.h
+++ b/include/deal.II/algorithms/general_data_storage.h
@@ -17,7 +17,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 
 #include <boost/core/demangle.hpp>

diff --git a/include/deal.II/algorithms/timestep_control.h b/include/deal.II/algorithms/timestep_control.h
index 676e26c9c88ae7990d0f5f3d44d9cd88e7780fdb..800d96f4803166b97bab50667ed1243bc7cef317 100644 (file)
--- a/include/deal.II/algorithms/timestep_control.h
+++ b/include/deal.II/algorithms/timestep_control.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/observer_pointer.h>
 
 #include <deal.II/lac/vector_memory.h>

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 32e250f7573445afd3f16f235130292df02f87e2..f8cbd4a9e3f39753acf2151f4e3f61e71fe838d6 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/function.h b/include/deal.II/base/function.h
index 5face6f70c572f789283c51b18eab8f08463af3a..52c8fcca574c721304fe36016991c129089c14c4 100644 (file)
--- a/include/deal.II/base/function.h
+++ b/include/deal.II/base/function.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/function_time.h>
 #include <deal.II/base/point.h>

diff --git a/include/deal.II/base/logstream.h b/include/deal.II/base/logstream.h
index 68f02aa3bd424183ab29337d16ffb366ec76bacf..9d7efc03140d911e68f7c9a21b7263bfd4abc97f 100644 (file)
--- a/include/deal.II/base/logstream.h
+++ b/include/deal.II/base/logstream.h
@@ -17,7 +17,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/observer_pointer.h>
 #include <deal.II/base/thread_local_storage.h>

diff --git a/include/deal.II/base/mg_level_object.h b/include/deal.II/base/mg_level_object.h
index ff11c5e9ec388eeb39d35790e37922411f122f27..db0fe4e275b7c954b844c9e3ec53d6635d1ce0e9 100644 (file)
--- a/include/deal.II/base/mg_level_object.h
+++ b/include/deal.II/base/mg_level_object.h
@@ -17,7 +17,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 
 #include <memory>
 #include <vector>

diff --git a/include/deal.II/base/observer_pointer.h b/include/deal.II/base/observer_pointer.h
index 0386d489362a56cfae33a8bae46418d682d2fbef..6cb352c1dc7bb33983ac56d17e80a3bc40dd2faa 100644 (file)
--- a/include/deal.II/base/observer_pointer.h
+++ b/include/deal.II/base/observer_pointer.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 
 #include <atomic>

diff --git a/include/deal.II/base/parameter_handler.h b/include/deal.II/base/parameter_handler.h
index 78684558fb2dd0e2937de0cd396de937e09b11d2..8dbb3ff39677ee626e24debeb8b53436946f4b8d 100644 (file)
--- a/include/deal.II/base/parameter_handler.h
+++ b/include/deal.II/base/parameter_handler.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/patterns.h>
 

diff --git a/include/deal.II/base/patterns.h b/include/deal.II/base/patterns.h
index 228b6e237ab984755b512a86631fc307625f4e9e..2300fa183d63139cb2682ea13b60299f36c2234c 100644 (file)
--- a/include/deal.II/base/patterns.h
+++ b/include/deal.II/base/patterns.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/point.h>
 #include <deal.II/base/template_constraints.h>

diff --git a/include/deal.II/base/polynomial.h b/include/deal.II/base/polynomial.h
index eff924ed45a2c05008d94d547610e2a0c32fda4e..836d26644a366684857aa434c768ecf4d72efb6e 100644 (file)
--- a/include/deal.II/base/polynomial.h
+++ b/include/deal.II/base/polynomial.h
@@ -19,7 +19,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/point.h>
 

diff --git a/include/deal.II/base/polynomials_hermite.h b/include/deal.II/base/polynomials_hermite.h
index bdf36583bee99ead7884207e6e7478f619b7e894..7f40ab42534ece6c566ed8d40864b5688828ed81 100644 (file)
--- a/include/deal.II/base/polynomials_hermite.h
+++ b/include/deal.II/base/polynomials_hermite.h
@@ -19,7 +19,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/point.h>
 #include <deal.II/base/polynomial.h>

diff --git a/include/deal.II/base/polynomials_piecewise.h b/include/deal.II/base/polynomials_piecewise.h
index 150b011015fb3a9e1886b4dbe647e304f2f4b4c4..063cdbb22ffc6c0d2a696a2d268ab2700ee78a20 100644 (file)
--- a/include/deal.II/base/polynomials_piecewise.h
+++ b/include/deal.II/base/polynomials_piecewise.h
@@ -19,7 +19,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/point.h>
 #include <deal.II/base/polynomial.h>

diff --git a/include/deal.II/base/quadrature.h b/include/deal.II/base/quadrature.h
index 25fa249504ffb558ed94fff411b687ec182567da..7a8b8432bcc6688efb88a9420902a3e96d6d19a6 100644 (file)
--- a/include/deal.II/base/quadrature.h
+++ b/include/deal.II/base/quadrature.h
@@ -19,7 +19,7 @@
 #include <deal.II/base/config.h>
 
 #include <deal.II/base/array_view.h>
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/point.h>
 
 #include <array>

diff --git a/include/deal.II/base/quadrature_point_data.h b/include/deal.II/base/quadrature_point_data.h
index 5dd88393ffef67ed4d74059aa0954f54ef35bc1a..3a5144b41bf3561015ce1d906381c0d88d2fc2c5 100644 (file)
--- a/include/deal.II/base/quadrature_point_data.h
+++ b/include/deal.II/base/quadrature_point_data.h
@@ -17,7 +17,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/quadrature.h>
 
 #include <deal.II/distributed/tria.h>

diff --git a/include/deal.II/base/subscriptor.h b/include/deal.II/base/subscriptor.h
index 17d4d6cdb7311284ffe57fd24852e4eda49bdf41..3f383f9f6487ff70ae714e31f693bde1e73abae2 100644 (file)
--- a/include/deal.II/base/subscriptor.h
+++ b/include/deal.II/base/subscriptor.h
@@ -18,6 +18,6 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 
 #endif

diff --git a/include/deal.II/base/symbolic_function.h b/include/deal.II/base/symbolic_function.h
index b4d42f6bbb4e257826ff0f60c944a6a94fb76a6e..2e816605ddbfb567eb1cd099d5e17e501dc77446 100644 (file)
--- a/include/deal.II/base/symbolic_function.h
+++ b/include/deal.II/base/symbolic_function.h
@@ -17,7 +17,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/function.h>
 #include <deal.II/base/point.h>

diff --git a/include/deal.II/base/table.h b/include/deal.II/base/table.h
index e9bda5dc471316f6f5afb25de74e98aa3aaf463c..8d755f0860557952493b0146c832f0fad0de4c76 100644 (file)
--- a/include/deal.II/base/table.h
+++ b/include/deal.II/base/table.h
@@ -18,7 +18,7 @@
 #include <deal.II/base/config.h>
 
 #include <deal.II/base/aligned_vector.h>
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/linear_index_iterator.h>
 #include <deal.II/base/memory_consumption.h>

diff --git a/include/deal.II/base/tensor_function.h b/include/deal.II/base/tensor_function.h
index 5a8b92764304b7532bbce6ddb34c4490ac923ab9..39ef90d8fcb4c15c1a49bf3d430c67a64d178413 100644 (file)
--- a/include/deal.II/base/tensor_function.h
+++ b/include/deal.II/base/tensor_function.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/function.h>
 #include <deal.II/base/function_time.h>

diff --git a/include/deal.II/distributed/shared_tria.h b/include/deal.II/distributed/shared_tria.h
index ab9c71432f2780e8cb3c30207d2cf7d92bdc2979..47d17b8b7aa4e4f66f9896612d68bc0cb57fce2b 100644 (file)
--- a/include/deal.II/distributed/shared_tria.h
+++ b/include/deal.II/distributed/shared_tria.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/mpi_stub.h>
 #include <deal.II/base/observer_pointer.h>
 #include <deal.II/base/template_constraints.h>

diff --git a/include/deal.II/distributed/tria.h b/include/deal.II/distributed/tria.h
index 81f22ef030af1de4b171dd60b0aaa5667d1257a2..a192c66f826a65839b5153e4604e5ad70a58d915 100644 (file)
--- a/include/deal.II/distributed/tria.h
+++ b/include/deal.II/distributed/tria.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/mpi_stub.h>
 #include <deal.II/base/observer_pointer.h>
 #include <deal.II/base/template_constraints.h>

diff --git a/include/deal.II/distributed/tria_base.h b/include/deal.II/distributed/tria_base.h
index 238fdb0a8ebe330bd42b7d4e45a959a9fc2e97f2..6bacae5666a76de1346c87b68e6b2a7b4f68f370 100644 (file)
--- a/include/deal.II/distributed/tria_base.h
+++ b/include/deal.II/distributed/tria_base.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/mpi_stub.h>
 #include <deal.II/base/observer_pointer.h>
 #include <deal.II/base/partitioner.h>

diff --git a/include/deal.II/dofs/block_info.h b/include/deal.II/dofs/block_info.h
index ac02189781e11695c5f299d6ce95c2a0e4163c23..f6506e9c0b58a172b2f306de90167bd968a0a5ab 100644 (file)
--- a/include/deal.II/dofs/block_info.h
+++ b/include/deal.II/dofs/block_info.h
@@ -17,7 +17,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/memory_consumption.h>
 #include <deal.II/base/template_constraints.h>
 

diff --git a/include/deal.II/fe/fe_coupling_values.h b/include/deal.II/fe/fe_coupling_values.h
index 53520d5980492a20c3103982cf8abbbe46d51bed..7b2e300fe1fde3a4e88b73f2f7352bc2e08a847b 100644 (file)
--- a/include/deal.II/fe/fe_coupling_values.h
+++ b/include/deal.II/fe/fe_coupling_values.h
@@ -20,7 +20,7 @@
 
 #include <deal.II/algorithms/general_data_storage.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/std_cxx20/iota_view.h>
 #include <deal.II/base/thread_local_storage.h>
 #include <deal.II/base/utilities.h>

diff --git a/include/deal.II/fe/fe_series.h b/include/deal.II/fe/fe_series.h
index 8aa5d6b690e60fbd5fadd3d5fecea82ef4be010b..6016387a562e012382978403837b791db8433d2e 100644 (file)
--- a/include/deal.II/fe/fe_series.h
+++ b/include/deal.II/fe/fe_series.h
@@ -19,7 +19,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/table.h>
 #include <deal.II/base/table_indices.h>

diff --git a/include/deal.II/fe/fe_tools.h b/include/deal.II/fe/fe_tools.h
index e32dbe0697ccd12d4ca7c93dc78dbc778164f88b..ea447a2392ce1199f1e7bd46ee85873a74bcb6c4 100644 (file)
--- a/include/deal.II/fe/fe_tools.h
+++ b/include/deal.II/fe/fe_tools.h
@@ -19,7 +19,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/geometry_info.h>
 #include <deal.II/base/symmetric_tensor.h>

diff --git a/include/deal.II/fe/fe_values.h b/include/deal.II/fe/fe_values.h
index 9a77d94f3ab737a38d52940baf9e631df6ff7b1f..142bcde1255852eb376994104285f7c6cea5d4af 100644 (file)
--- a/include/deal.II/fe/fe_values.h
+++ b/include/deal.II/fe/fe_values.h
@@ -19,7 +19,7 @@
 #include <deal.II/base/config.h>
 
 #include <deal.II/base/derivative_form.h>
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/point.h>
 #include <deal.II/base/quadrature.h>

diff --git a/include/deal.II/fe/fe_values_base.h b/include/deal.II/fe/fe_values_base.h
index b938fffc05987053ce0979ec1dc48f44732c00fb..6d70abcf37c99a7845af2a80dedfc0848cdd8fbf 100644 (file)
--- a/include/deal.II/fe/fe_values_base.h
+++ b/include/deal.II/fe/fe_values_base.h
@@ -19,7 +19,7 @@
 #include <deal.II/base/config.h>
 
 #include <deal.II/base/derivative_form.h>
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/point.h>
 #include <deal.II/base/quadrature.h>

diff --git a/include/deal.II/grid/composition_manifold.h b/include/deal.II/grid/composition_manifold.h
index e20427a68fa0ee808d5037cc6fbad37329c8d091..b903472286481e512a7f5bbd7c57d5d49a9f2282 100644 (file)
--- a/include/deal.II/grid/composition_manifold.h
+++ b/include/deal.II/grid/composition_manifold.h
@@ -21,7 +21,7 @@
 #include <deal.II/base/config.h>
 
 #include <deal.II/base/derivative_form.h>
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/point.h>
 #include <deal.II/base/quadrature_lib.h>
 

diff --git a/include/deal.II/grid/grid_tools_cache.h b/include/deal.II/grid/grid_tools_cache.h
index f1f21613c7ea7c4e55d0405db599d9e69c448a1f..c2b79f09de58d8cd6cae17b2821439ef482ba925 100644 (file)
--- a/include/deal.II/grid/grid_tools_cache.h
+++ b/include/deal.II/grid/grid_tools_cache.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/point.h>
 

diff --git a/include/deal.II/grid/manifold.h b/include/deal.II/grid/manifold.h
index 644f1ae7d74916145d713ca3c41eff9b7c0704f8..74563eefc8107688cae526c7c9512111384f348f 100644 (file)
--- a/include/deal.II/grid/manifold.h
+++ b/include/deal.II/grid/manifold.h
@@ -22,7 +22,7 @@
 
 #include <deal.II/base/array_view.h>
 #include <deal.II/base/derivative_form.h>
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/point.h>
 #include <deal.II/base/quadrature_lib.h>
 

diff --git a/include/deal.II/grid/tensor_product_manifold.h b/include/deal.II/grid/tensor_product_manifold.h
index eb08d7e58e00691aff4b24e2959b40a260277a28..f4bffedd58b053c542ac4b54e8f9260d2c9c105b 100644 (file)
--- a/include/deal.II/grid/tensor_product_manifold.h
+++ b/include/deal.II/grid/tensor_product_manifold.h
@@ -17,7 +17,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/point.h>
 #include <deal.II/base/utilities.h>
 

diff --git a/include/deal.II/grid/tria.h b/include/deal.II/grid/tria.h
index bab4b37b6597906d8c3ad1e7da0524e1ac80683b..ee370b57df4eef70664ff08377ccac3ce3673366 100644 (file)
--- a/include/deal.II/grid/tria.h
+++ b/include/deal.II/grid/tria.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/geometry_info.h>
 #include <deal.II/base/iterator_range.h>
 #include <deal.II/base/observer_pointer.h>

diff --git a/include/deal.II/hp/collection.h b/include/deal.II/hp/collection.h
index 985f2522576a8ba614a3763f0eeb832f9ef7e12d..b21e085a01156d2cc8348dba204917fe77ab0801 100644 (file)
--- a/include/deal.II/hp/collection.h
+++ b/include/deal.II/hp/collection.h
@@ -17,7 +17,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/memory_consumption.h>
 
 #include <iterator>

diff --git a/include/deal.II/hp/mapping_collection.h b/include/deal.II/hp/mapping_collection.h
index 67d853ec1089914af78a31e6c5668f7a283b5332..c88fd9f1c68d459434edb3bbbd600e7810ec5d36 100644 (file)
--- a/include/deal.II/hp/mapping_collection.h
+++ b/include/deal.II/hp/mapping_collection.h
@@ -17,7 +17,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 
 #include <deal.II/fe/fe.h>
 #include <deal.II/fe/mapping.h>

diff --git a/include/deal.II/hp/q_collection.h b/include/deal.II/hp/q_collection.h
index f4c5c01a0d8d0d4d4bfcb282128ce1fedd367c0d..b6d315ed9f8a9b4831176dbf4863883aa2150b1c 100644 (file)
--- a/include/deal.II/hp/q_collection.h
+++ b/include/deal.II/hp/q_collection.h
@@ -17,7 +17,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/memory_consumption.h>
 #include <deal.II/base/quadrature.h>
 

diff --git a/include/deal.II/lac/affine_constraints.h b/include/deal.II/lac/affine_constraints.h
index 43d280257680493d36adec0002698af194bcd513..5d571adecf6c6413dfbbffd3221e83f0767eb286 100644 (file)
--- a/include/deal.II/lac/affine_constraints.h
+++ b/include/deal.II/lac/affine_constraints.h
@@ -17,7 +17,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/index_set.h>
 #include <deal.II/base/table.h>

diff --git a/include/deal.II/lac/block_indices.h b/include/deal.II/lac/block_indices.h
index d7ebf02f1637db173eaec9359b0110d06a14abc5..0aa24de7baf2e9c50ddbc8c938c5714c2bbf3f0e 100644 (file)
--- a/include/deal.II/lac/block_indices.h
+++ b/include/deal.II/lac/block_indices.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/logstream.h>
 

diff --git a/include/deal.II/lac/block_sparse_matrix_ez.h b/include/deal.II/lac/block_sparse_matrix_ez.h
index 1d7a7aa52e4dc8439a90d3da7614cf8e2208cccb..c80494a39d45abc070dbca5095753a11f2f46e08 100644 (file)
--- 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 <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/observer_pointer.h>
 #include <deal.II/base/table.h>

diff --git a/include/deal.II/lac/block_sparsity_pattern.h b/include/deal.II/lac/block_sparsity_pattern.h
index 55c6b37bb78d098b6fea425249748c157d27635a..72615e8b30ffc05d4cb942123b68e9291a7ae472 100644 (file)
--- a/include/deal.II/lac/block_sparsity_pattern.h
+++ b/include/deal.II/lac/block_sparsity_pattern.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/observer_pointer.h>
 #include <deal.II/base/table.h>

diff --git a/include/deal.II/lac/block_vector_base.h b/include/deal.II/lac/block_vector_base.h
index a4c848d9df6f56e106a9fde1860ad21361d8b422..69d69db3f71d6d249f2dda7938e92969d1c2b1d6 100644 (file)
--- a/include/deal.II/lac/block_vector_base.h
+++ b/include/deal.II/lac/block_vector_base.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/memory_consumption.h>
 #include <deal.II/base/numbers.h>

diff --git a/include/deal.II/lac/chunk_sparse_matrix.h b/include/deal.II/lac/chunk_sparse_matrix.h
index 62d717709312f7610d3a20598e401138cd4ac455..ef7402f785985f0b162c812c707811c04ab5c9d7 100644 (file)
--- a/include/deal.II/lac/chunk_sparse_matrix.h
+++ b/include/deal.II/lac/chunk_sparse_matrix.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/observer_pointer.h>
 
 #include <deal.II/lac/chunk_sparsity_pattern.h>

diff --git a/include/deal.II/lac/chunk_sparsity_pattern.h b/include/deal.II/lac/chunk_sparsity_pattern.h
index ac78820adb269365ea5f0439f121e24fbe6143b9..312032b6754ec5f1ccabe9f5eb6e803f0012e9de 100644 (file)
--- a/include/deal.II/lac/chunk_sparsity_pattern.h
+++ b/include/deal.II/lac/chunk_sparsity_pattern.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 
 #include <deal.II/lac/sparsity_pattern.h>

diff --git a/include/deal.II/lac/dynamic_sparsity_pattern.h b/include/deal.II/lac/dynamic_sparsity_pattern.h
index 908ed30ff9802a5a74483b3d9b14dd5941c3f11a..adffb5014822cf47d3f9712db1b2aa7b32207c46 100644 (file)
--- a/include/deal.II/lac/dynamic_sparsity_pattern.h
+++ b/include/deal.II/lac/dynamic_sparsity_pattern.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/index_set.h>
 #include <deal.II/base/utilities.h>
 

diff --git a/include/deal.II/lac/la_parallel_vector.h b/include/deal.II/lac/la_parallel_vector.h
index 9570c17748e1855393d7c6282cab71fbc8f68e68..3d69c99348bd953f8d4d9e6407afdff7379a7ae8 100644 (file)
--- a/include/deal.II/lac/la_parallel_vector.h
+++ b/include/deal.II/lac/la_parallel_vector.h
@@ -18,7 +18,7 @@
 #include <deal.II/base/config.h>
 
 #include <deal.II/base/communication_pattern_base.h>
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/memory_space.h>
 #include <deal.II/base/memory_space_data.h>
 #include <deal.II/base/mpi_stub.h>

diff --git a/include/deal.II/lac/petsc_matrix_base.h b/include/deal.II/lac/petsc_matrix_base.h
index 190582715bb163ba627ef1aada185eb0e872093a..c4b116978e12481fd788d1a8d706457398cf6248 100644 (file)
--- 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 <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#  include <deal.II/base/enable_observer_pointer.h>
 
 #  include <deal.II/lac/exceptions.h>
 #  include <deal.II/lac/full_matrix.h>

diff --git a/include/deal.II/lac/petsc_precondition.h b/include/deal.II/lac/petsc_precondition.h
index 969fe3ea3fd404ee6532aac329f0ad2eb9f01a79..9d5e117be8ca1c4680c2fe59b7b8ec7d18f257c5 100644 (file)
--- a/include/deal.II/lac/petsc_precondition.h
+++ b/include/deal.II/lac/petsc_precondition.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/point.h>
 
 #ifdef DEAL_II_WITH_PETSC

diff --git a/include/deal.II/lac/petsc_vector.h b/include/deal.II/lac/petsc_vector.h
index 591f04b3ac259be9b72d8b765df8b062fd748704..c3045925483b9ac9ed8eebe8e8f0b15b153ed673 100644 (file)
--- 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 <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#  include <deal.II/base/enable_observer_pointer.h>
 #  include <deal.II/base/index_set.h>
 #  include <deal.II/base/partitioner.h>
 

diff --git a/include/deal.II/lac/petsc_vector_base.h b/include/deal.II/lac/petsc_vector_base.h
index 5798b44edcad167b4d5ce3aad951dcb45d442962..fb980744b8079acda29064f6e9328da20ea64577 100644 (file)
--- 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 <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#  include <deal.II/base/enable_observer_pointer.h>
 #  include <deal.II/base/index_set.h>
 
 #  include <deal.II/lac/exceptions.h>

diff --git a/include/deal.II/lac/precondition_block.h b/include/deal.II/lac/precondition_block.h
index 138bf6846f303ffc7578cba26700db58b07d5f8b..17b39d5e2c9a56b34e34a9f5e18fc9bdfc21e361 100644 (file)
--- a/include/deal.II/lac/precondition_block.h
+++ b/include/deal.II/lac/precondition_block.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/observer_pointer.h>
 

diff --git a/include/deal.II/lac/precondition_block_base.h b/include/deal.II/lac/precondition_block_base.h
index 5e89816e723622194c0d2c9b206ef19bf70a04e7..067740a998b69a6d2d392c54800167de837cf7e6 100644 (file)
--- a/include/deal.II/lac/precondition_block_base.h
+++ b/include/deal.II/lac/precondition_block_base.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/logstream.h>
 #include <deal.II/base/memory_consumption.h>

diff --git a/include/deal.II/lac/precondition_selector.h b/include/deal.II/lac/precondition_selector.h
index e6c7e86a0e729b2bbf13f1e98e347285866404fc..b49cda21586233ad1a0945140703d06d57c8d2f7 100644 (file)
--- a/include/deal.II/lac/precondition_selector.h
+++ b/include/deal.II/lac/precondition_selector.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/observer_pointer.h>
 
 #include <string>

diff --git a/include/deal.II/lac/read_write_vector.h b/include/deal.II/lac/read_write_vector.h
index a6cd5b885ebaf9d53b08f4128d8a17247d432af9..dd6865e69d7287438315b3a6c5d59f292bafa1dd 100644 (file)
--- a/include/deal.II/lac/read_write_vector.h
+++ b/include/deal.II/lac/read_write_vector.h
@@ -19,7 +19,7 @@
 
 #include <deal.II/base/aligned_vector.h>
 #include <deal.II/base/communication_pattern_base.h>
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/index_set.h>
 #include <deal.II/base/memory_consumption.h>
 #include <deal.II/base/mpi_stub.h>

diff --git a/include/deal.II/lac/relaxation_block.h b/include/deal.II/lac/relaxation_block.h
index 76987dfc76a9fee20025f7b8620df6aa00192b9d..23774cb192c7d9e4bc8091997d68d7ed12d45517 100644 (file)
--- a/include/deal.II/lac/relaxation_block.h
+++ b/include/deal.II/lac/relaxation_block.h
@@ -17,7 +17,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/observer_pointer.h>
 
 #include <deal.II/lac/precondition_block_base.h>

diff --git a/include/deal.II/lac/solver.h b/include/deal.II/lac/solver.h
index 285499d75543af3ce61d7f19d80389e261178794..f055bf321c34aa574c2effc3cca6791673438825 100644 (file)
--- a/include/deal.II/lac/solver.h
+++ b/include/deal.II/lac/solver.h
@@ -17,7 +17,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/template_constraints.h>
 
 #include <deal.II/lac/solver_control.h>

diff --git a/include/deal.II/lac/solver_bicgstab.h b/include/deal.II/lac/solver_bicgstab.h
index 32093f9765928eb40eee1b012f6d41657c2649e9..07a0f95ef6ad45d0419580e3a9e86a71a5ccaca3 100644 (file)
--- a/include/deal.II/lac/solver_bicgstab.h
+++ b/include/deal.II/lac/solver_bicgstab.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/logstream.h>
 #include <deal.II/base/signaling_nan.h>
 #include <deal.II/base/template_constraints.h>

diff --git a/include/deal.II/lac/solver_cg.h b/include/deal.II/lac/solver_cg.h
index d92619dc7b53ce65e9e6a588d17d1d6111224952..1a3b68568fb16a889289328be4a0fc0ef0871c03 100644 (file)
--- a/include/deal.II/lac/solver_cg.h
+++ b/include/deal.II/lac/solver_cg.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/logstream.h>
 #include <deal.II/base/template_constraints.h>

diff --git a/include/deal.II/lac/solver_control.h b/include/deal.II/lac/solver_control.h
index 01308b97446b06a75dec30267b6d07b0c3375361..d93bb5d44c7d50683608a0fffd8499b8169f9b56 100644 (file)
--- a/include/deal.II/lac/solver_control.h
+++ b/include/deal.II/lac/solver_control.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 
 #include <vector>
 

diff --git a/include/deal.II/lac/solver_gmres.h b/include/deal.II/lac/solver_gmres.h
index f1d0e5a89f4d16ec7c80e9ef2fda45dad6c089b5..c6d74e269e6c7436d899ded434d5a2d045a28e34 100644 (file)
--- a/include/deal.II/lac/solver_gmres.h
+++ b/include/deal.II/lac/solver_gmres.h
@@ -19,7 +19,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/logstream.h>
 #include <deal.II/base/template_constraints.h>
 

diff --git a/include/deal.II/lac/solver_idr.h b/include/deal.II/lac/solver_idr.h
index f6ce9af1c1ba14acb2e4d8bb6f2647328a95e92b..20dc1fac068fa8815055d31f15a1cbe73a6fcf66 100644 (file)
--- a/include/deal.II/lac/solver_idr.h
+++ b/include/deal.II/lac/solver_idr.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/logstream.h>
 #include <deal.II/base/signaling_nan.h>
 #include <deal.II/base/template_constraints.h>

diff --git a/include/deal.II/lac/solver_minres.h b/include/deal.II/lac/solver_minres.h
index 2ae06d072d5cb35b3788e9e4af66e47354fb67d9..a2340082e7fed379bddec5aa5c800963784edf90 100644 (file)
--- a/include/deal.II/lac/solver_minres.h
+++ b/include/deal.II/lac/solver_minres.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/logstream.h>
 #include <deal.II/base/signaling_nan.h>
 #include <deal.II/base/template_constraints.h>

diff --git a/include/deal.II/lac/solver_qmrs.h b/include/deal.II/lac/solver_qmrs.h
index 121ac0db2e62528098dbc6bd2cc817e9e94f94fd..5ece20741264ccc6aaceba089c09db9cf18713c8 100644 (file)
--- a/include/deal.II/lac/solver_qmrs.h
+++ b/include/deal.II/lac/solver_qmrs.h
@@ -17,7 +17,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/logstream.h>
 #include <deal.II/base/template_constraints.h>
 

diff --git a/include/deal.II/lac/solver_relaxation.h b/include/deal.II/lac/solver_relaxation.h
index 20b2e337331131081caab63242b46e230e3d4186..c394e1bb83760acd4d8791ade386d4c597474b22 100644 (file)
--- a/include/deal.II/lac/solver_relaxation.h
+++ b/include/deal.II/lac/solver_relaxation.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/logstream.h>
 #include <deal.II/base/template_constraints.h>
 

diff --git a/include/deal.II/lac/sparse_direct.h b/include/deal.II/lac/sparse_direct.h
index 29e9b1a91794ed0d2b51bdf0ef26e40c1c72fe41..8c2d482538b15803ae0758a3635b0df73a6a75f1 100644 (file)
--- a/include/deal.II/lac/sparse_direct.h
+++ b/include/deal.II/lac/sparse_direct.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 
 #include <deal.II/lac/block_sparse_matrix.h>

diff --git a/include/deal.II/lac/sparse_matrix.h b/include/deal.II/lac/sparse_matrix.h
index 6d7ac5d93fa0356825f99936f181758f0bd27cb3..47779962a0c44bba58544a9b2d0c835eb04bd2ed 100644 (file)
--- a/include/deal.II/lac/sparse_matrix.h
+++ b/include/deal.II/lac/sparse_matrix.h
@@ -17,7 +17,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/mpi_stub.h>
 #include <deal.II/base/observer_pointer.h>
 

diff --git a/include/deal.II/lac/sparse_matrix_ez.h b/include/deal.II/lac/sparse_matrix_ez.h
index 6d6d9a3232be2cdfd4ec71b37651eec6c9c055a6..933f584959dd1f39ed79e388d45711b3e9a4ba9b 100644 (file)
--- a/include/deal.II/lac/sparse_matrix_ez.h
+++ b/include/deal.II/lac/sparse_matrix_ez.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/observer_pointer.h>
 
 #include <deal.II/lac/exceptions.h>

diff --git a/include/deal.II/lac/sparsity_pattern.h b/include/deal.II/lac/sparsity_pattern.h
index 39e11353ef3164f3657a0063c5ab3c0665de66d8..485af6a96644eaacdbfae903d86ff15436b31c99 100644 (file)
--- a/include/deal.II/lac/sparsity_pattern.h
+++ b/include/deal.II/lac/sparsity_pattern.h
@@ -19,7 +19,7 @@
 #include <deal.II/base/config.h>
 
 #include <deal.II/base/array_view.h>
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/linear_index_iterator.h>
 

diff --git a/include/deal.II/lac/sparsity_pattern_base.h b/include/deal.II/lac/sparsity_pattern_base.h
index 75effad791a1cf1a2f23ca2fbf9f00a73ccbcbf1..5d1b3225442c2211f0835918f07c064048aeeadb 100644 (file)
--- a/include/deal.II/lac/sparsity_pattern_base.h
+++ b/include/deal.II/lac/sparsity_pattern_base.h
@@ -19,7 +19,7 @@
 #include <deal.II/base/config.h>
 
 #include <deal.II/base/array_view.h>
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 
 #include <utility>

diff --git a/include/deal.II/lac/tridiagonal_matrix.h b/include/deal.II/lac/tridiagonal_matrix.h
index d52098f2045358b8fb022267ba9324f9b419a555..277a7d98ecc7d324d8811c08b8f3139f21e7496f 100644 (file)
--- a/include/deal.II/lac/tridiagonal_matrix.h
+++ b/include/deal.II/lac/tridiagonal_matrix.h
@@ -17,7 +17,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 
 #include <deal.II/lac/lapack_support.h>
 

diff --git a/include/deal.II/lac/trilinos_epetra_vector.h b/include/deal.II/lac/trilinos_epetra_vector.h
index 78212ddb0f0f3c58cff35c08e9f5b1c6a4354136..abb01652876f1822ba1db66c593c78d66bbe682f 100644 (file)
--- 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 <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#  include <deal.II/base/enable_observer_pointer.h>
 #  include <deal.II/base/index_set.h>
 #  include <deal.II/base/mpi_stub.h>
 

diff --git a/include/deal.II/lac/trilinos_precondition.h b/include/deal.II/lac/trilinos_precondition.h
index 7e0f2344a95d8a5f11086bc891fc9e5a4b309820..9e55ce883077c71cd7395c825024b1dd7e3c1cc3 100644 (file)
--- 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 <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#  include <deal.II/base/enable_observer_pointer.h>
 
 #  include <deal.II/lac/la_parallel_vector.h>
 #  include <deal.II/lac/trilinos_vector.h>

diff --git a/include/deal.II/lac/trilinos_sparse_matrix.h b/include/deal.II/lac/trilinos_sparse_matrix.h
index 8e05a1433ce82fa35b23463a9614ea040117ae91..b4dbf2321328c356e5f0170e0cb569b486424995 100644 (file)
--- 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 <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#    include <deal.II/base/enable_observer_pointer.h>
 #    include <deal.II/base/index_set.h>
 #    include <deal.II/base/mpi_stub.h>
 

diff --git a/include/deal.II/lac/trilinos_sparsity_pattern.h b/include/deal.II/lac/trilinos_sparsity_pattern.h
index 2809ad980ea4ce774d8b69012dc7643a68177590..96225f98e72cbb481a51deaf081c7ca721afdd22 100644 (file)
--- 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 <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#  include <deal.II/base/enable_observer_pointer.h>
 #  include <deal.II/base/index_set.h>
 #  include <deal.II/base/mpi_stub.h>
 #  include <deal.II/base/utilities.h>

diff --git a/include/deal.II/lac/trilinos_tpetra_precondition.h b/include/deal.II/lac/trilinos_tpetra_precondition.h
index 19d4721429e50e90014a83103edfaa72ef370aa1..76b3aa5f3a29018fe63fe092dde0854cb1130a60 100644 (file)
--- 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 <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#  include <deal.II/base/enable_observer_pointer.h>
 
 #  include <deal.II/lac/la_parallel_vector.h>
 #  include <deal.II/lac/trilinos_tpetra_sparse_matrix.h>

diff --git a/include/deal.II/lac/trilinos_tpetra_sparse_matrix.h b/include/deal.II/lac/trilinos_tpetra_sparse_matrix.h
index 1e6af0de7c3880c0e4017b87ae6796416db323e8..a8587ec021b55863d779cecdf8eb46786cc8177c 100644 (file)
--- 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 <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#  include <deal.II/base/enable_observer_pointer.h>
 #  include <deal.II/base/index_set.h>
 #  include <deal.II/base/trilinos_utilities.h>
 

diff --git a/include/deal.II/lac/trilinos_tpetra_sparsity_pattern.h b/include/deal.II/lac/trilinos_tpetra_sparsity_pattern.h
index 18a84c1a8650fddd73c95ba2eda7a2535da9de09..8de6def2147c27ede8a9935c15f65f9b3ef8fa03 100644 (file)
--- 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 <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#  include <deal.II/base/enable_observer_pointer.h>
 #  include <deal.II/base/index_set.h>
 #  include <deal.II/base/mpi_stub.h>
 

diff --git a/include/deal.II/lac/trilinos_tpetra_vector.h b/include/deal.II/lac/trilinos_tpetra_vector.h
index f5e5c89d92e1390ae11a69b5b3e1a90eaa31c23b..9161ee191f394ed21e31884dfed1ff26c50fef83 100644 (file)
--- 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 <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#  include <deal.II/base/enable_observer_pointer.h>
 #  include <deal.II/base/index_set.h>
 #  include <deal.II/base/mpi_stub.h>
 

diff --git a/include/deal.II/lac/trilinos_vector.h b/include/deal.II/lac/trilinos_vector.h
index 459b6d3b38f7aa313d7a5187bb98bc583bd043f3..708ef61e4c793299cd9115bd43e075cbcf67733f 100644 (file)
--- a/include/deal.II/lac/trilinos_vector.h
+++ b/include/deal.II/lac/trilinos_vector.h
@@ -19,7 +19,7 @@
 #include <deal.II/base/config.h>
 
 #ifdef DEAL_II_WITH_TRILINOS
-#  include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#  include <deal.II/base/enable_observer_pointer.h>
 #  include <deal.II/base/index_set.h>
 #  include <deal.II/base/mpi_stub.h>
 #  include <deal.II/base/partitioner.h>

diff --git a/include/deal.II/lac/vector.h b/include/deal.II/lac/vector.h
index 7723b3f8fbeb67c865bd37987d3e12416be439d4..48aa1cd8bae6472dfc735f6cde7ad9b64b6d81d4 100644 (file)
--- a/include/deal.II/lac/vector.h
+++ b/include/deal.II/lac/vector.h
@@ -19,7 +19,7 @@
 #include <deal.II/base/config.h>
 
 #include <deal.II/base/aligned_vector.h>
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/index_set.h>
 #include <deal.II/base/numbers.h>

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 54ef0833f5fe086d3a8a0c5cc66abd9048dacab8..9d7ab4e6d04c7c0fcbaf929f929087ace5e73af4 100644 (file)
--- 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 <deal.II/base/config.h>
 
 #include <deal.II/base/aligned_vector.h>
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/vectorization.h>
 

diff --git a/include/deal.II/matrix_free/operators.h b/include/deal.II/matrix_free/operators.h
index 29bb9497d5b72c0c8740ae75b554e3bb4f9f36ba..7e2a209646cd0ab1602411b8d1cbe17d1dd6ae42 100644 (file)
--- a/include/deal.II/matrix_free/operators.h
+++ b/include/deal.II/matrix_free/operators.h
@@ -19,7 +19,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/vectorization.h>
 

diff --git a/include/deal.II/meshworker/local_integrator.h b/include/deal.II/meshworker/local_integrator.h
index 31e4864c55d138f4a981bc1af86091a757e90f70..4e83c8c56d7e8550ec0a9366a1fa116a6aef5ace 100644 (file)
--- a/include/deal.II/meshworker/local_integrator.h
+++ b/include/deal.II/meshworker/local_integrator.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 
 #include <functional>
 #include <string>

diff --git a/include/deal.II/multigrid/mg_base.h b/include/deal.II/multigrid/mg_base.h
index 21f21357fdfffd5fa1ab3eaf3e6bcefde9e1d247..65b1d425c353c4c15b425e50788754ecccd3280b 100644 (file)
--- a/include/deal.II/multigrid/mg_base.h
+++ b/include/deal.II/multigrid/mg_base.h
@@ -22,7 +22,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/observer_pointer.h>
 
 #include <deal.II/lac/vector.h>

diff --git a/include/deal.II/multigrid/mg_constrained_dofs.h b/include/deal.II/multigrid/mg_constrained_dofs.h
index e9b2bc22648f04b6f980ef79075f3cbd76a93fe1..ebe5c84114850167174e91e748b5b23bd5438772 100644 (file)
--- a/include/deal.II/multigrid/mg_constrained_dofs.h
+++ b/include/deal.II/multigrid/mg_constrained_dofs.h
@@ -17,7 +17,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/mg_level_object.h>
 
 #include <deal.II/lac/affine_constraints.h>

diff --git a/include/deal.II/multigrid/multigrid.h b/include/deal.II/multigrid/multigrid.h
index 1a362d6df9f035facc6f2b3266c48ecdefd32818..6bd55bee16e3ed087e688280a985fc89287d027a 100644 (file)
--- a/include/deal.II/multigrid/multigrid.h
+++ b/include/deal.II/multigrid/multigrid.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/mg_level_object.h>
 #include <deal.II/base/observer_pointer.h>
 

diff --git a/include/deal.II/non_matching/immersed_surface_quadrature.h b/include/deal.II/non_matching/immersed_surface_quadrature.h
index 4983f70765d015e2d33f55c3b8ed8a6cca782e09..f260c83fe5c61076437e29c16b8be5796954ce80 100644 (file)
--- 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 <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/point.h>
 #include <deal.II/base/quadrature.h>
 #include <deal.II/base/tensor.h>

diff --git a/include/deal.II/numerics/data_postprocessor.h b/include/deal.II/numerics/data_postprocessor.h
index e6d7429d256fdf11039ef872af15c3a05f223f32..d077755b9c07ec63f0b3a7d72e03ffcb80a0804c 100644 (file)
--- a/include/deal.II/numerics/data_postprocessor.h
+++ b/include/deal.II/numerics/data_postprocessor.h
@@ -19,7 +19,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/point.h>
 #include <deal.II/base/tensor.h>
 

diff --git a/include/deal.II/numerics/time_dependent.h b/include/deal.II/numerics/time_dependent.h
index 983fc4f32b504cd2dd67016ac5441919210f09b0..7ddb0e6976dc4798533d403f7aaf70c050b06ded 100644 (file)
--- a/include/deal.II/numerics/time_dependent.h
+++ b/include/deal.II/numerics/time_dependent.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/observer_pointer.h>
 #include <deal.II/base/template_constraints.h>

diff --git a/include/deal.II/particles/particle_handler.h b/include/deal.II/particles/particle_handler.h
index 1f94d4b42893f8077026a07e58d8b67b0e5438a6..351e9196b91163448461c05cb58c4e119d47bdbf 100644 (file)
--- a/include/deal.II/particles/particle_handler.h
+++ b/include/deal.II/particles/particle_handler.h
@@ -19,7 +19,7 @@
 
 #include <deal.II/base/array_view.h>
 #include <deal.II/base/bounding_box.h>
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/function.h>
 #include <deal.II/base/observer_pointer.h>
 

diff --git a/source/base/CMakeLists.txt b/source/base/CMakeLists.txt
index cbc0c82c656b0c4a51d6de70f054cf4dae1041ec..1b40cf626eee4e000db4f7af2f252903ff713351 100644 (file)
--- 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 67984b99fdcf8a547533b49f63cb4395be67d95d..4360970748788702e7b0ee1d44c3ee6dccf3060b 100644 (file)
--- a/source/base/enable_ref_counting_by_observer.cc
+++ b/source/base/enable_observer_pointer.cc
@@ -12,7 +12,7 @@
 //
 // ------------------------------------------------------------------------
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/logstream.h>
 
 #include <algorithm>

diff --git a/tests/base/assign_subscriptor.cc b/tests/base/assign_subscriptor.cc
index 4a017416de99af4c891d2ab3a22768c2f5aee905..df84f1aebb3895b7acd287319955e5cc5eae3b97 100644 (file)
--- a/tests/base/assign_subscriptor.cc
+++ b/tests/base/assign_subscriptor.cc
@@ -18,7 +18,7 @@
 // pair for copy and move semantics.
 
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/observer_pointer.h>
 
 #include <iostream>

diff --git a/tests/base/reference.cc b/tests/base/reference.cc
index 0c889ed98ca3c7807d432b774bd92c324c7f6722..bd108241430b45aecb5de16202391e648504c62d 100644 (file)
--- a/tests/base/reference.cc
+++ b/tests/base/reference.cc
@@ -19,7 +19,7 @@
 // other tests.
 
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/observer_pointer.h>
 
 #include <iostream>

diff --git a/tests/base/smart_pointer_01.cc b/tests/base/smart_pointer_01.cc
index b05f1065252f0120be2daa106afad3a14d24b434..7288fefd4b4280d934a95dab7e949814ec93eb3c 100644 (file)
--- a/tests/base/smart_pointer_01.cc
+++ b/tests/base/smart_pointer_01.cc
@@ -18,7 +18,7 @@
 // std::any object.
 
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/observer_pointer.h>
 
 #include <any>

diff --git a/tests/base/smart_pointer_02.cc b/tests/base/smart_pointer_02.cc
index 7a998648ed3cce090fd217a66e9bc8ceeb9e6e87..9701ea7c8ad61013eb3663158e2668049aa8c3c1 100644 (file)
--- 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 <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/observer_pointer.h>
 #include <deal.II/base/smartpointer.h>
 

diff --git a/tests/base/unsubscribe_subscriptor.cc b/tests/base/unsubscribe_subscriptor.cc
index 880d9f167c2608d7e49f07bd2d34c6d13ba63006..a454c4e14d8923993f87c68eb5564d0fcd8ea92e 100644 (file)
--- 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 <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/observer_pointer.h>
 
 #include <iostream>

diff --git a/tests/base/unsubscribe_subscriptor.debug.output b/tests/base/unsubscribe_subscriptor.debug.output
index 249be17af72d024ed5f836eae5575dc8b38f4d26..3afe48c72b5997ef92fcc7317345f8b875ce3296 100644 (file)
--- 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 <enable_ref_counting_by_observer.cc> in function
+An error occurred in file <enable_observer_pointer.cc> in function
     void dealii::EnableObserverPointer::unsubscribe(std::atomic<bool>*, 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 <enable_ref_counting_by_observer.cc> in function
+An error occurred in file <enable_observer_pointer.cc> in function
     void dealii::EnableObserverPointer::unsubscribe(std::atomic<bool>*, 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 b98b7259b9dfad68a098e35c4bf33cff6b6be768..7644777cb603b019f25d28bb4a23369b5a01de18 100644 (file)
--- 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 <enable_ref_counting_by_observer.cc> in function
+An error occurred in file <enable_observer_pointer.cc> in function
     void dealii::EnableObserverPointer::unsubscribe(std::atomic<bool> *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 <enable_ref_counting_by_observer.cc> in function
+An error occurred in file <enable_observer_pointer.cc> in function
     void dealii::EnableObserverPointer::unsubscribe(std::atomic<bool> *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 013cba366d5de01e1477bdd1832ef4209e52d558..6b6890a683c186f7a7faa3419ed22170adf1077a 100644 (file)
--- 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 <enable_ref_counting_by_observer.cc> in function
+An error occurred in file <enable_observer_pointer.cc> in function
     void dealii::EnableObserverPointer::unsubscribe(std::atomic<bool>*, 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 <enable_ref_counting_by_observer.cc> in function
+An error occurred in file <enable_observer_pointer.cc> in function
     void dealii::EnableObserverPointer::unsubscribe(std::atomic<bool>*, 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 27d7542855aa986eaad65ca69e1382b927900445..b2966668cfd09ebc6e25a4bcfb2ca1990be10206 100644 (file)
--- 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 <enable_ref_counting_by_observer.cc> in function
+An error occurred in file <enable_observer_pointer.cc> in function
     void dealii::EnableObserverPointer::unsubscribe(std::atomic<bool> *, const std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char>> &) 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 <enable_ref_counting_by_observer.cc> in function
+An error occurred in file <enable_observer_pointer.cc> in function
     void dealii::EnableObserverPointer::unsubscribe(std::atomic<bool> *, const std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char>> &) 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 0a4e4a03bca746fd3a635fbcf1b6b52a4dede710..3df6a2f77a219c14f3f9c50749bacb9ed6259324 100644 (file)
--- a/tests/base/unsubscribe_subscriptor_01.cc
+++ b/tests/base/unsubscribe_subscriptor_01.cc
@@ -19,7 +19,7 @@
 // works as well
 
 
-#include <deal.II/base/enable_ref_counting_by_observer_pointer.h>
+#include <deal.II/base/enable_observer_pointer.h>
 #include <deal.II/base/observer_pointer.h>
 
 #include <iostream>