]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Fix some items that occured with gcc3.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 11 Apr 2001 13:15:41 +0000 (13:15 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 11 Apr 2001 13:15:41 +0000 (13:15 +0000)
git-svn-id: https://svn.dealii.org/trunk@4430 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/base/include/base/thread_management.h

index e9ad9b08175ff0d35731095425b90f6dfd72a5a2..cc52e993975cd5e03559e20fe84adbcc0467a402 100644 (file)
@@ -5156,15 +5156,18 @@ namespace Threads
               const ForwardIterator &end,
               const unsigned int     n_intervals)
   {
+    typedef typename std::pair<ForwardIterator,ForwardIterator> 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<std::pair<ForwardIterator,ForwardIterator> >
-             (1, make_pair<ForwardIterator>(begin, end)));
+      return (typename std::vector<IteratorPair>
+             (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<std::pair<ForwardIterator,ForwardIterator> >
-      return_values (n_intervals);
+    std::vector<IteratorPair> return_values (n_intervals);
 
     return_values[0].first = begin;
     for (unsigned int i=0; i<n_intervals; ++i)

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.