From: wolf Date: Thu, 8 Sep 2005 19:07:46 +0000 (+0000) Subject: Work around a problem with gcc4.0.1 that claimed a call was ambiguous when it X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12bc963891e9f0f414ca0b7b1cf9e80b3984a153;p=dealii-svn.git 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 b418d04ddb..6d01e4cccb 100644 --- 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::vmult (OutVector& dst, template threaded_vmult); Threads::ThreadGroup<> threads; for (unsigned int i=0; i > (*this, comp) (dst, src, n_rows * i / n_threads, n_rows * (i+1) / n_threads); threads.join_all(); @@ -509,7 +509,7 @@ SparseMatrix::matrix_norm_square (const Vector& v) const template threaded_matrix_norm_square); Threads::ThreadGroup<> threads; for (unsigned int i=0; i > (*this, comp)(v, n_rows * i / n_threads, n_rows * (i+1) / n_threads, &partial_sums[i]); @@ -622,7 +622,7 @@ SparseMatrix::matrix_scalar_product (const Vector& u, template threaded_matrix_scalar_product); Threads::ThreadGroup<> threads; for (unsigned int i=0; i > (*this, comp)(u, v, n_rows * i / n_threads, n_rows * (i+1) / n_threads, &partial_sums[i]); @@ -800,7 +800,7 @@ SparseMatrix::residual (Vector &dst, template threaded_residual; Threads::ThreadGroup<> threads; for (unsigned int i=0; i > (*this, comp_residual)(dst, u, b, std::pair (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 384d8bf853..92a85e6897 100644 --- 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::vmult (Vector &dst, = &SparseVanka::template apply_preconditioner; Threads::ThreadGroup<> threads; for (unsigned int block=0; block*>(this), comp) + threads += Threads::spawn >(*static_cast*>(this), comp) (dst, src,&dof_masks[block]); threads.join_all (); }