Make threaded functions void again (instead of void*).

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

diff --git a/deal.II/lac/Todo b/deal.II/lac/Todo
index 5a69843553ea55cb57f0692460fbfe93ca239653..add3adf645a2b8d95dde507fa5af0feab66865d6 100644 (file)
--- 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 350bae412fa052c84af6edc8c85818c91f4ba4f6..911b599239e2a1e0aa30ebc06dac6df1fcb236c1 100644 (file)
--- 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 <typename somenumber>
-    void * threaded_vmult (Vector<somenumber>       &dst,
-                          const Vector<somenumber> &src,
-                          const unsigned int        begin_row,
-                          const unsigned int        end_row) const;
+    void threaded_vmult (Vector<somenumber>       &dst,
+                        const Vector<somenumber> &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 <typename somenumber>
-    void * threaded_matrix_norm (const Vector<somenumber> &v,
-                                const unsigned int        begin_row,
-                                const unsigned int        end_row,
-                                somenumber               *partial_sum) const;
+    void threaded_matrix_norm (const Vector<somenumber> &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 <typename somenumber>
-    void * threaded_residual (Vector<somenumber>       &dst,
-                             const Vector<somenumber> &u,
-                             const Vector<somenumber> &b,
-                             const unsigned int        begin_row,
-                             const unsigned int        end_row,
-                             somenumber               *partial_norm) const;
+    void threaded_residual (Vector<somenumber>       &dst,
+                           const Vector<somenumber> &u,
+                           const Vector<somenumber> &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 75ed719b7c0e14d08491b0952f541db7015fe00a..55a63344b43b3359b4d51da9dad2092bfc974193 100644 (file)
--- 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<number>::vmult (Vector<somenumber>& dst, const Vector<somenumber>&
 
 template <typename number>
 template <typename somenumber>
-void *
+void
 SparseMatrix<number>::threaded_vmult (Vector<somenumber>       &dst,
                                      const Vector<somenumber> &src,
                                      const unsigned int        begin_row,
@@ -300,8 +300,6 @@ SparseMatrix<number>::threaded_vmult (Vector<somenumber>       &dst,
                                   // when not in parallel mode.
   Assert (false, ExcInternalError());
 #endif
-
-  return 0;
 };
 
 
@@ -458,7 +456,7 @@ SparseMatrix<number>::matrix_norm (const Vector<somenumber>& v) const
 
 template <typename number>
 template <typename somenumber>
-void *
+void
 SparseMatrix<number>::threaded_matrix_norm (const Vector<somenumber> &v,
                                            const unsigned int        begin_row,
                                            const unsigned int        end_row,
@@ -483,7 +481,6 @@ SparseMatrix<number>::threaded_matrix_norm (const Vector<somenumber> &v,
                                   // function should not have been called
   Assert (false, ExcInternalError());
 #endif
-  return 0;
 };
 
 
@@ -612,7 +609,7 @@ SparseMatrix<number>::residual (Vector<somenumber>       &dst,
 
 template <typename number>
 template <typename somenumber>
-void *
+void
 SparseMatrix<number>::threaded_residual (Vector<somenumber>       &dst,
                                         const Vector<somenumber> &u,
                                         const Vector<somenumber> &b,
@@ -639,8 +636,6 @@ SparseMatrix<number>::threaded_residual (Vector<somenumber>       &dst,
 #else
   Assert (false, ExcInternalError());
 #endif
-
-  return 0;
 };