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 58830f53d746e6ab8653f87b80d6a8bbc86d9aab..221e31685339eebf5b72dee33134241b2ac270df 100644 (file)
--- 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<number>::residual (Vector<somenumber>       &dst,
                        Threads::encapsulate (&SparseMatrix<number>::
                                              template threaded_residual<somenumber>)
                        .collect_args (this, dst, u, b,
-                                      make_pair<unsigned int,unsigned int>
+                                      std::make_pair<unsigned int,unsigned int>
                                       (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 a47753b6e70b16b89ca6b73622e6a42d2cf516f5..69b61d658fcc945c68a8e6770957fe99df90131b 100644 (file)
--- 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<number>::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