From: wolf Date: Tue, 30 Apr 2002 16:15:59 +0000 (+0000) Subject: Add some std:: where necessary. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5ed48cd90bc511d38cf19319e4b3b46fd6b9f9c;p=dealii-svn.git Add some std:: where necessary. git-svn-id: https://svn.dealii.org/trunk@5781 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 ccf128d295..3ead4bbe90 100644 --- a/deal.II/lac/include/lac/sparse_matrix.templates.h +++ b/deal.II/lac/include/lac/sparse_matrix.templates.h @@ -458,9 +458,9 @@ SparseMatrix::matrix_norm_square (const Vector& v) const // ... and wait until they're finished thread_manager.wait (); // accumulate the partial results - return accumulate (partial_sums.begin(), - partial_sums.end(), - 0.); + return std::accumulate (partial_sums.begin(), + partial_sums.end(), + 0.); }; #endif // if not in MT mode or the matrix is @@ -551,9 +551,9 @@ SparseMatrix::matrix_scalar_product (const Vector& u, // ... and wait until they're finished thread_manager.wait (); // accumulate the partial results - return accumulate (partial_sums.begin(), - partial_sums.end(), - 0.); + return std::accumulate (partial_sums.begin(), + partial_sums.end(), + 0.); }; #endif // if not in MT mode or the matrix is @@ -688,9 +688,9 @@ SparseMatrix::residual (Vector &dst, // ... and wait until they're finished thread_manager.wait (); // accumulate the partial results - return sqrt(accumulate (partial_norms.begin(), - partial_norms.end(), - 0.)); + return std::sqrt(std::accumulate (partial_norms.begin(), + partial_norms.end(), + 0.)); }; #endif