Remove deprecated constructors for SparseMatrix iterators and accessors.

diff --git a/doc/news/changes.h b/doc/news/changes.h
index 39277d8a952ed3eeed56d17f539f0932045e5172..eaddd5ddbe5e39c16fd4342024ee3494d0333ebc 100644 (file)
--- a/doc/news/changes.h
+++ b/doc/news/changes.h
@@ -211,6 +211,8 @@ inconvenience this causes.
   - Classes FEEvaluationDGP, FEEvaluationGeneral and FEEvaluationGL.
   - Classes PreconditionedMatrix and PreconditionLACSolver.
   - PETScVectors::MPI::Vector constructors and reinit() variants.
+  - SparseMatrixIterators::Accessor and SparseMatrixIterators::Iterator
+    constructors.
   <br>
   This release also removes the deprecated class MGDoFHandler. The
   functionality of this class had previously been incorporated into

diff --git a/include/deal.II/lac/sparse_matrix.h b/include/deal.II/lac/sparse_matrix.h
index d8bd4762d716567b0886edb7674994513cd4626f..1eda6776967f4b773a9689315f50a62bbd6a41c1 100644 (file)
--- a/include/deal.II/lac/sparse_matrix.h
+++ b/include/deal.II/lac/sparse_matrix.h
@@ -108,16 +108,6 @@ namespace SparseMatrixIterators
      */
     typedef const SparseMatrix<number> MatrixType;
 
-    /**
-     * Constructor.
-     *
-     * @deprecated This constructor is deprecated. Use the other constructor
-     * with a global index instead.
-     */
-    Accessor (MatrixType     *matrix,
-              const size_type row,
-              const size_type index) DEAL_II_DEPRECATED;
-
     /**
      * Constructor.
      */
@@ -253,13 +243,6 @@ namespace SparseMatrixIterators
      */
     typedef SparseMatrix<number> MatrixType;
 
-    /**
-     * Constructor.
-     */
-    Accessor (MatrixType     *matrix,
-              const size_type row,
-              const size_type index);
-
     /**
      * Constructor.
      */
@@ -355,17 +338,6 @@ namespace SparseMatrixIterators
     typedef
     const Accessor<number,Constness> &value_type;
 
-    /**
-     * Constructor. Create an iterator into the matrix @p matrix for the given
-     * row and the index within it.
-     *
-     * @deprecated This constructor is deprecated. Use the other constructor
-     * with a global index instead.
-     */
-    Iterator (MatrixType     *matrix,
-              const size_type row,
-              const size_type index) DEAL_II_DEPRECATED;
-
     /**
      * Constructor. Create an iterator into the matrix @p matrix for the given
      * index in the complete matrix (counting from the zeroth entry).
@@ -2041,20 +2013,6 @@ SparseMatrix<number>::copy_from (const ForwardIterator begin,
 
 namespace SparseMatrixIterators
 {
-  template <typename number>
-  inline
-  Accessor<number,true>::
-  Accessor (const MatrixType *matrix,
-            const size_type   row,
-            const size_type   index)
-    :
-    SparsityPatternIterators::Accessor (&matrix->get_sparsity_pattern(),
-                                        row, index),
-    matrix (matrix)
-  {}
-
-
-
   template <typename number>
   inline
   Accessor<number,true>::
@@ -2191,20 +2149,6 @@ namespace SparseMatrixIterators
 
 
 
-  template <typename number>
-  inline
-  Accessor<number,false>::
-  Accessor (MatrixType      *matrix,
-            const size_type  row,
-            const size_type  index)
-    :
-    SparsityPatternIterators::Accessor (&matrix->get_sparsity_pattern(),
-                                        row, index),
-    matrix (matrix)
-  {}
-
-
-
   template <typename number>
   inline
   Accessor<number,false>::
@@ -2250,18 +2194,6 @@ namespace SparseMatrixIterators
 
 
 
-  template <typename number, bool Constness>
-  inline
-  Iterator<number, Constness>::
-  Iterator (MatrixType      *matrix,
-            const size_type  r,
-            const size_type  i)
-    :
-    accessor(matrix, r, i)
-  {}
-
-
-
   template <typename number, bool Constness>
   inline
   Iterator<number, Constness>::