Remove old type DoFHandler::FunctionMap by FunctionMap::type

git-svn-id: https://svn.dealii.org/trunk@4717 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/deal.II/include/dofs/dof_tools.h b/deal.II/deal.II/include/dofs/dof_tools.h
index 1598f430cff4bf2df2fcb8b18f2b213e89671731..816318674d06e1dd2153744b7c256a889dc63b99 100644 (file)
--- a/deal.II/deal.II/include/dofs/dof_tools.h
+++ b/deal.II/deal.II/include/dofs/dof_tools.h
@@ -338,7 +338,7 @@ class DoFTools
     template<int dim>
     static void
     make_boundary_sparsity_pattern (const DoFHandler<dim> &dof,
-                                   const typename DoFHandler<dim>::FunctionMap &boundary_indicators,
+                                   const typename FunctionMap<dim>::type &boundary_indicators,
                                    const std::vector<unsigned int>  &dof_to_boundary_mapping,
                                    SparsityPattern    &sparsity); 
 
@@ -1039,7 +1039,7 @@ class DoFTools
 template <>
 void
 DoFTools::make_boundary_sparsity_pattern (const DoFHandler<1> &dof_handler,
-                                         const DoFHandler<1>::FunctionMap  &function_map,
+                                         const FunctionMap<1>::type  &function_map,
                                          const std::vector<unsigned int>  &dof_to_boundary_mapping,
                                          SparsityPattern    &sparsity);
 template <>

diff --git a/deal.II/deal.II/source/dofs/dof_tools.cc b/deal.II/deal.II/source/dofs/dof_tools.cc
index b6b5bb4dbe1da035b643b4c18e4c93d47ddcd34c..fecf5fa65419f18760db9d993a57d7265cf1d6df 100644 (file)
--- a/deal.II/deal.II/source/dofs/dof_tools.cc
+++ b/deal.II/deal.II/source/dofs/dof_tools.cc
@@ -235,7 +235,7 @@ DoFTools::make_boundary_sparsity_pattern (const DoFHandler<dim>& dof,
 
 template <int dim>
 void DoFTools::make_boundary_sparsity_pattern (const DoFHandler<dim>& dof,
-                                              const typename DoFHandler<dim>::FunctionMap  &boundary_indicators,
+                                              const typename FunctionMap<dim>::type  &boundary_indicators,
                                               const std::vector<unsigned int>  &dof_to_boundary_mapping,
                                               SparsityPattern    &sparsity)
 {