redundant subscription removed from SparseMatrix

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

diff --git a/deal.II/lac/Todo b/deal.II/lac/Todo
index add3adf645a2b8d95dde507fa5af0feab66865d6..a90d77d1afbf7e98fed090c3b1b776dba66e32d4 100644 (file)
--- a/deal.II/lac/Todo
+++ b/deal.II/lac/Todo
@@ -12,9 +12,3 @@ Why not replace Vector::scale by Vector::operator *= ?
 
 Use the commented-out version in PreconditionBlock::invert_diagblocks
   using the try-catch clauses
-
-
-Someone should take a look at the handling of the sparsity variable
-  in the sparse matrix: it is subscribed to twice (explicitely and 
-  through the subscriptor); the explicit subscription is redundant,
-  but I don't have the time to look into that now.

diff --git a/deal.II/lac/include/lac/sparse_matrix.templates.h b/deal.II/lac/include/lac/sparse_matrix.templates.h
index 170e4bad33387caf9eba8b985dfcc5f91e160624..2348d8c66bd2786b65eb3104c13628e12e11016c 100644 (file)
--- a/deal.II/lac/include/lac/sparse_matrix.templates.h
+++ b/deal.II/lac/include/lac/sparse_matrix.templates.h
@@ -41,7 +41,6 @@ SparseMatrix<number>::SparseMatrix () :
 
 template <typename number>
 SparseMatrix<number>::SparseMatrix (const SparseMatrix &m) :
-               Subscriptor(),
                cols(0),
                val(0),
                max_len(0)
@@ -70,7 +69,6 @@ SparseMatrix<number>::SparseMatrix (const SparsityPattern &c) :
                val(0),
                max_len(0)
 {
-  cols->subscribe ();
   reinit();
 };
 
@@ -78,8 +76,6 @@ SparseMatrix<number>::SparseMatrix (const SparsityPattern &c) :
 template <typename number>
 SparseMatrix<number>::~SparseMatrix ()
 {
-  if (cols != 0)
-    cols->unsubscribe();
   cols = 0;
   
   if (val != 0)
@@ -119,12 +115,7 @@ template <typename number>
 void
 SparseMatrix<number>::reinit (const SparsityPattern &sparsity)
 {
-  if (cols != 0)
-    cols->unsubscribe();
-  
   cols = &sparsity;
-  cols->subscribe();
-  
   reinit ();
 };
 
@@ -133,8 +124,6 @@ template <typename number>
 void
 SparseMatrix<number>::clear ()
 {
-  if (cols != 0)
-    cols->unsubscribe ();
   cols = 0;
   if (val) delete[] val;
   val = 0;