From 81e40f3ff41dd4d9dad8877b00bbd5ac577d58dd Mon Sep 17 00:00:00 2001 From: wolf Date: Wed, 16 Feb 2000 17:40:46 +0000 Subject: [PATCH] Make threaded functions void again (instead of void*). git-svn-id: https://svn.dealii.org/trunk@2422 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/lac/Todo | 5 ---- deal.II/lac/include/lac/sparse_matrix.h | 28 +++++++++---------- .../lac/include/lac/sparse_matrix.templates.h | 11 ++------ 3 files changed, 17 insertions(+), 27 deletions(-) diff --git a/deal.II/lac/Todo b/deal.II/lac/Todo index 5a69843553..add3adf645 100644 --- a/deal.II/lac/Todo +++ b/deal.II/lac/Todo @@ -18,8 +18,3 @@ 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. - - -Change the threaded* functions of the SparseMatrix to return void - instead of void* when the respective classes in ThreadManager are - updated. diff --git a/deal.II/lac/include/lac/sparse_matrix.h b/deal.II/lac/include/lac/sparse_matrix.h index 350bae412f..911b599239 100644 --- a/deal.II/lac/include/lac/sparse_matrix.h +++ b/deal.II/lac/include/lac/sparse_matrix.h @@ -611,10 +611,10 @@ class SparseMatrix : public Subscriptor * of enabled multithreading. */ template - void * threaded_vmult (Vector &dst, - const Vector &src, - const unsigned int begin_row, - const unsigned int end_row) const; + void threaded_vmult (Vector &dst, + const Vector &src, + const unsigned int begin_row, + const unsigned int end_row) const; /** * Version of #matrix_norm# which only @@ -624,10 +624,10 @@ class SparseMatrix : public Subscriptor * the case of enabled multithreading. */ template - void * threaded_matrix_norm (const Vector &v, - const unsigned int begin_row, - const unsigned int end_row, - somenumber *partial_sum) const; + void threaded_matrix_norm (const Vector &v, + const unsigned int begin_row, + const unsigned int end_row, + somenumber *partial_sum) const; /** * Version of #residual# which only @@ -637,12 +637,12 @@ class SparseMatrix : public Subscriptor * the case of enabled multithreading. */ template - void * threaded_residual (Vector &dst, - const Vector &u, - const Vector &b, - const unsigned int begin_row, - const unsigned int end_row, - somenumber *partial_norm) const; + void threaded_residual (Vector &dst, + const Vector &u, + const Vector &b, + const unsigned int begin_row, + const unsigned int end_row, + somenumber *partial_norm) const; // make all other sparse matrices diff --git a/deal.II/lac/include/lac/sparse_matrix.templates.h b/deal.II/lac/include/lac/sparse_matrix.templates.h index 75ed719b7c..55a63344b4 100644 --- a/deal.II/lac/include/lac/sparse_matrix.templates.h +++ b/deal.II/lac/include/lac/sparse_matrix.templates.h @@ -277,7 +277,7 @@ SparseMatrix::vmult (Vector& dst, const Vector& template template -void * +void SparseMatrix::threaded_vmult (Vector &dst, const Vector &src, const unsigned int begin_row, @@ -300,8 +300,6 @@ SparseMatrix::threaded_vmult (Vector &dst, // when not in parallel mode. Assert (false, ExcInternalError()); #endif - - return 0; }; @@ -458,7 +456,7 @@ SparseMatrix::matrix_norm (const Vector& v) const template template -void * +void SparseMatrix::threaded_matrix_norm (const Vector &v, const unsigned int begin_row, const unsigned int end_row, @@ -483,7 +481,6 @@ SparseMatrix::threaded_matrix_norm (const Vector &v, // function should not have been called Assert (false, ExcInternalError()); #endif - return 0; }; @@ -612,7 +609,7 @@ SparseMatrix::residual (Vector &dst, template template -void * +void SparseMatrix::threaded_residual (Vector &dst, const Vector &u, const Vector &b, @@ -639,8 +636,6 @@ SparseMatrix::threaded_residual (Vector &dst, #else Assert (false, ExcInternalError()); #endif - - return 0; }; -- 2.39.5