Work around a problem with gcc4.0.1 that claimed a call was ambiguous when it

really wasn't.

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

diff --git a/deal.II/lac/include/lac/sparse_matrix.templates.h b/deal.II/lac/include/lac/sparse_matrix.templates.h
index b418d04ddbb508dde1996fc8add4a72de4cad02a..6d01e4cccbf595eef20faa3a7a08daaa909480ee 100644 (file)
--- a/deal.II/lac/include/lac/sparse_matrix.templates.h
+++ b/deal.II/lac/include/lac/sparse_matrix.templates.h
@@ -335,7 +335,7 @@ SparseMatrix<number>::vmult (OutVector& dst,
            template threaded_vmult<OutVector,InVector>);
       Threads::ThreadGroup<> threads;
       for (unsigned int i=0; i<n_threads; ++i)
-       threads += Threads::spawn (*this, comp) (dst, src,
+       threads += Threads::spawn<void, SparseMatrix<number> > (*this, comp) (dst, src,
                                                  n_rows * i / n_threads,
                                                  n_rows * (i+1) / n_threads);
       threads.join_all();
@@ -509,7 +509,7 @@ SparseMatrix<number>::matrix_norm_square (const Vector<somenumber>& v) const
            template threaded_matrix_norm_square<somenumber>);
       Threads::ThreadGroup<> threads;
       for (unsigned int i=0; i<n_threads; ++i)
-       threads += Threads::spawn (*this, comp)(v,
+       threads += Threads::spawn<void, SparseMatrix<number> > (*this, comp)(v,
                                                 n_rows * i / n_threads,
                                                 n_rows * (i+1) / n_threads,
                                                 &partial_sums[i]);
@@ -622,7 +622,7 @@ SparseMatrix<number>::matrix_scalar_product (const Vector<somenumber>& u,
            template threaded_matrix_scalar_product<somenumber>);
       Threads::ThreadGroup<> threads;
       for (unsigned int i=0; i<n_threads; ++i)
-       threads += Threads::spawn (*this, comp)(u, v,
+       threads += Threads::spawn<void, SparseMatrix<number> > (*this, comp)(u, v,
                                                 n_rows * i / n_threads,
                                                 n_rows * (i+1) / n_threads,
                                                 &partial_sums[i]);
@@ -800,7 +800,7 @@ SparseMatrix<number>::residual (Vector<somenumber>       &dst,
                                     template threaded_residual<somenumber>;
       Threads::ThreadGroup<> threads;
       for (unsigned int i=0; i<n_threads; ++i)
-       threads += Threads::spawn (*this, comp_residual)(dst, u, b,
+       threads += Threads::spawn<void, SparseMatrix<number> > (*this, comp_residual)(dst, u, b,
                                                          std::pair<unsigned int,unsigned int>
                                                          (n_rows * i / n_threads,
                                                           n_rows * (i+1) / n_threads),

diff --git a/deal.II/lac/include/lac/sparse_vanka.templates.h b/deal.II/lac/include/lac/sparse_vanka.templates.h
index 384d8bf853b2ab7fa32e5badb513bc7556ef8393..92a85e68974f83fdd5b0fddc77b72fa77a7d5490 100644 (file)
--- a/deal.II/lac/include/lac/sparse_vanka.templates.h
+++ b/deal.II/lac/include/lac/sparse_vanka.templates.h
@@ -596,7 +596,7 @@ void SparseBlockVanka<number>::vmult (Vector<number2>       &dst,
             = &SparseVanka<number>::template apply_preconditioner<number2>;
           Threads::ThreadGroup<> threads;
           for (unsigned int block=0; block<n_blocks; ++block)
-            threads += Threads::spawn(*static_cast<const SparseVanka<number>*>(this), comp)
+            threads += Threads::spawn<void,SparseVanka<number> >(*static_cast<const SparseVanka<number>*>(this), comp)
                        (dst, src,&dof_masks[block]);
           threads.join_all ();
         }