From 7a575b54251499716190f491cda7ca957890ca08 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Sun, 1 Feb 2015 16:19:23 -0600 Subject: [PATCH] Remove deprecated constructors for SparseMatrix iterators and accessors. --- doc/news/changes.h | 2 + include/deal.II/lac/sparse_matrix.h | 68 ----------------------------- 2 files changed, 2 insertions(+), 68 deletions(-) diff --git a/doc/news/changes.h b/doc/news/changes.h index 39277d8a95..eaddd5ddbe 100644 --- 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.
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 d8bd4762d7..1eda677696 100644 --- 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 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 MatrixType; - /** - * Constructor. - */ - Accessor (MatrixType *matrix, - const size_type row, - const size_type index); - /** * Constructor. */ @@ -355,17 +338,6 @@ namespace SparseMatrixIterators typedef const Accessor &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::copy_from (const ForwardIterator begin, namespace SparseMatrixIterators { - template - inline - Accessor:: - Accessor (const MatrixType *matrix, - const size_type row, - const size_type index) - : - SparsityPatternIterators::Accessor (&matrix->get_sparsity_pattern(), - row, index), - matrix (matrix) - {} - - - template inline Accessor:: @@ -2191,20 +2149,6 @@ namespace SparseMatrixIterators - template - inline - Accessor:: - Accessor (MatrixType *matrix, - const size_type row, - const size_type index) - : - SparsityPatternIterators::Accessor (&matrix->get_sparsity_pattern(), - row, index), - matrix (matrix) - {} - - - template inline Accessor:: @@ -2250,18 +2194,6 @@ namespace SparseMatrixIterators - template - inline - Iterator:: - Iterator (MatrixType *matrix, - const size_type r, - const size_type i) - : - accessor(matrix, r, i) - {} - - - template inline Iterator:: -- 2.39.5