From 5ad2210e6a6a48a3e3c4d70ef477c5233c3bfc88 Mon Sep 17 00:00:00 2001 From: wolf Date: Wed, 11 Apr 2001 13:15:41 +0000 Subject: [PATCH] Fix some items that occured with gcc3. git-svn-id: https://svn.dealii.org/trunk@4430 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/base/include/base/thread_management.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/deal.II/base/include/base/thread_management.h b/deal.II/base/include/base/thread_management.h index e9ad9b0817..cc52e99397 100644 --- a/deal.II/base/include/base/thread_management.h +++ b/deal.II/base/include/base/thread_management.h @@ -5156,15 +5156,18 @@ namespace Threads const ForwardIterator &end, const unsigned int n_intervals) { + typedef typename std::pair IteratorPair; + // in non-multithreaded mode, we // often have the case that this // function is called with // n_intervals==1, so have a // shortcut here to handle that // case efficiently + if (n_intervals==1) - return (std::vector > - (1, make_pair(begin, end))); + return (typename std::vector + (1, IteratorPair(begin, end))); // if more than one interval // requested, do the full work @@ -5172,8 +5175,7 @@ namespace Threads const unsigned int n_elements_per_interval = n_elements / n_intervals; const unsigned int residual = n_elements % n_intervals; - std::vector > - return_values (n_intervals); + std::vector return_values (n_intervals); return_values[0].first = begin; for (unsigned int i=0; i