From: Wolfgang Bangerth <bangerth@colostate.edu>
Date: Wed, 29 Jan 2020 19:45:52 +0000 (-0700)
Subject: Rename a deprecated function.
X-Git-Tag: v9.2.0-rc1~572^2~4
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdcc12529aa67cc9c9440a846d574c3eac83ba84;p=dealii.git

Rename a deprecated function.
---

diff --git a/include/deal.II/dofs/dof_tools.h b/include/deal.II/dofs/dof_tools.h
index e579caa874..01de1f284f 100644
--- a/include/deal.II/dofs/dof_tools.h
+++ b/include/deal.II/dofs/dof_tools.h
@@ -2303,7 +2303,7 @@ namespace DoFTools
    */
   template <typename DoFHandlerType>
   std::vector<types::global_dof_index>
-  count_dofs_per_component(
+  count_dofs_per_fe_component(
     const DoFHandlerType &           dof_handler,
     const bool                       vector_valued_once = false,
     const std::vector<unsigned int> &target_component   = {});
@@ -2338,9 +2338,9 @@ namespace DoFTools
    */
   template <typename DoFHandlerType>
   std::vector<types::global_dof_index>
-  count_dofs_per_block(const DoFHandlerType &           dof,
-                       const std::vector<unsigned int> &target_block =
-                         std::vector<unsigned int>());
+  count_dofs_per_fe_block(const DoFHandlerType &           dof,
+                          const std::vector<unsigned int> &target_block =
+                            std::vector<unsigned int>());
 
   /**
    * @deprecated A version of the previous function that returns its
diff --git a/source/dofs/dof_tools.cc b/source/dofs/dof_tools.cc
index 134ef0719a..19c9b83a4f 100644
--- a/source/dofs/dof_tools.cc
+++ b/source/dofs/dof_tools.cc
@@ -1910,16 +1910,17 @@ namespace DoFTools
     const std::vector<unsigned int> &     target_component)
   {
     dofs_per_component =
-      count_dofs_per_component(dof_handler, only_once, target_component);
+      count_dofs_per_fe_component(dof_handler, only_once, target_component);
   }
 
 
 
   template <typename DoFHandlerType>
   std::vector<types::global_dof_index>
-  count_dofs_per_component(const DoFHandlerType &           dof_handler,
-                           const bool                       only_once,
-                           const std::vector<unsigned int> &target_component_)
+  count_dofs_per_fe_component(
+    const DoFHandlerType &           dof_handler,
+    const bool                       only_once,
+    const std::vector<unsigned int> &target_component_)
   {
     const unsigned int n_components = dof_handler.get_fe(0).n_components();
 
@@ -2015,15 +2016,15 @@ namespace DoFTools
                        std::vector<types::global_dof_index> &dofs_per_block,
                        const std::vector<unsigned int> &     target_block)
   {
-    dofs_per_block = count_dofs_per_block(dof_handler, target_block);
+    dofs_per_block = count_dofs_per_fe_block(dof_handler, target_block);
   }
 
 
 
   template <typename DoFHandlerType>
   std::vector<types::global_dof_index>
-  count_dofs_per_block(const DoFHandlerType &           dof_handler,
-                       const std::vector<unsigned int> &target_block_)
+  count_dofs_per_fe_block(const DoFHandlerType &           dof_handler,
+                          const std::vector<unsigned int> &target_block_)
   {
     const dealii::hp::FECollection<DoFHandlerType::dimension,
                                    DoFHandlerType::space_dimension>