From: Wolfgang Bangerth Date: Thu, 31 Jan 2002 16:48:44 +0000 (+0000) Subject: Fix missing std:: X-Git-Tag: v8.0.0~18396 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=378f5a97f04c8a1c590e02a89c7d956143fe70e0;p=dealii.git Fix missing std:: git-svn-id: https://svn.dealii.org/trunk@5439 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 58830f53d7..221e316853 100644 --- a/deal.II/lac/include/lac/sparse_matrix.templates.h +++ b/deal.II/lac/include/lac/sparse_matrix.templates.h @@ -661,7 +661,7 @@ SparseMatrix::residual (Vector &dst, Threads::encapsulate (&SparseMatrix:: template threaded_residual) .collect_args (this, dst, u, b, - make_pair + std::make_pair (n_rows * i / n_threads, n_rows * (i+1) / n_threads), &partial_norms[i])); diff --git a/deal.II/lac/include/lac/sparse_vanka.templates.h b/deal.II/lac/include/lac/sparse_vanka.templates.h index a47753b6e7..69b61d658f 100644 --- a/deal.II/lac/include/lac/sparse_vanka.templates.h +++ b/deal.II/lac/include/lac/sparse_vanka.templates.h @@ -76,8 +76,8 @@ SparseVanka::compute_inverses () selected.end(), true); - const unsigned int n_inverses_per_thread = max(n_inverses / n_threads, - 1U); + const unsigned int n_inverses_per_thread = std::max(n_inverses / n_threads, + 1U); // set up start and end index for // each of the threads. note that