Re-add the old function signature, mark as deprecated.

diff --git a/doc/news/changes/incompatibilities/20170116Bangerth-2 b/doc/news/changes/minor/20170116Bangerth-3
similarity index 100%
rename from doc/news/changes/incompatibilities/20170116Bangerth-2
rename to doc/news/changes/minor/20170116Bangerth-3

diff --git a/include/deal.II/fe/fe_tools.h b/include/deal.II/fe/fe_tools.h
index a4cf52596c903d49018962fe36764a92f3911401..b5bea872a788f1bb518c704ae9dd386b5b5fa41d 100644 (file)
--- a/include/deal.II/fe/fe_tools.h
+++ b/include/deal.II/fe/fe_tools.h
@@ -300,6 +300,17 @@ namespace FETools
   FullMatrix<double>
   compute_node_matrix(const FiniteElement<dim,spacedim> &fe);
 
+  /**
+   * Same as the function above, but return the matrix by reference through
+   * the first argument, rather than as the function's return value.
+   *
+   * @deprecated
+   */
+  template <int dim, int spacedim>
+  void
+  compute_node_matrix(FullMatrix<double> &M,
+                      const FiniteElement<dim,spacedim> &fe) DEAL_II_DEPRECATED;
+
   /**
    * For all possible (isotropic and anisotropic) refinement cases compute the
    * embedding matrices from a coarse cell to the child cells. Each column of

diff --git a/source/fe/fe_tools.cc b/source/fe/fe_tools.cc
index 65c4a14d128f79fbaf4b29e1330aaadc8e6b87d7..4a054a7704c4b571165635382bc804aa1d3c80cf 100644 (file)
--- a/source/fe/fe_tools.cc
+++ b/source/fe/fe_tools.cc
@@ -1666,6 +1666,17 @@ namespace FETools
   }
 
 
+
+  template<int dim, int spacedim>
+  void
+  compute_node_matrix(FullMatrix<double> &M,
+                      const FiniteElement<dim,spacedim> &fe)
+  {
+    M = compute_node_matrix (fe);
+  }
+
+
+
   /*
     template<>
     void

diff --git a/source/fe/fe_tools.inst.in b/source/fe/fe_tools.inst.in
index a1af55ec32a06fb336220c2ce3457ca109220e29..c3d5eb9b34ae0d5068f677bf7e6e92adab2f724a 100644 (file)
--- a/source/fe/fe_tools.inst.in
+++ b/source/fe/fe_tools.inst.in
@@ -146,6 +146,11 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS
     FullMatrix<double>
     compute_node_matrix(const FiniteElement<deal_II_dimension> &);
 
+    template
+    void
+    compute_node_matrix(FullMatrix<double> &,
+                        const FiniteElement<deal_II_dimension> &);
+
     template
     void compute_component_wise(
         const FiniteElement<deal_II_dimension> & ,