fix instantiation issue with concurrent filter and map

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/core/concurrent/qtconcurrentfilterkernel.h b/src/core/concurrent/qtconcurrentfilterkernel.h
index 8fceaa4..81698bf 100644 (file)
--- a/src/core/concurrent/qtconcurrentfilterkernel.h
+++ b/src/core/concurrent/qtconcurrentfilterkernel.h
@@ -54,7 +54,6 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 
-
 namespace QtConcurrent {
 
 template <typename T>
@@ -120,11 +119,11 @@ public:
 
 
         typename Sequence::const_iterator it = sequenceBeginIterator;
-        advance(it, begin);
+        std::advance(it, begin);
         for (int i = begin; i < end; ++i) {
             if (keep(*it))
                 results.vector.append(*it);
-            advance(it, 1);
+            std::advance(it, 1);
         }
 
         reducer.runReduce(reduce, reducedResult, results);
@@ -206,11 +205,11 @@ public:
         results.vector.reserve(end - begin);
 
         Iterator it = sequenceBeginIterator;
-        advance(it, begin);
+        std::advance(it, begin);
         for (int i = begin; i < end; ++i) {
             if (keep(*it))
                 results.vector.append(*it);
-            advance(it, 1);
+            std::advance(it, 1);
         }
 
         reducer.runReduce(reduce, reducedResult, results);
@@ -282,11 +281,11 @@ public:
         results.vector.reserve(count);
 
         Iterator it = sequenceBeginIterator;
-        advance(it, begin);
+        std::advance(it, begin);
         for (int i = begin; i < end; ++i) {
             if (keep(*it))
                 results.vector.append(*it);
-            advance(it, 1);
+            std::advance(it, 1);
         }
 
         this->reportResults(results.vector, begin, count);

diff --git a/src/core/concurrent/qtconcurrentmapkernel.h b/src/core/concurrent/qtconcurrentmapkernel.h
index 0bbde3f..1fc0a6d 100644 (file)
--- a/src/core/concurrent/qtconcurrentmapkernel.h
+++ b/src/core/concurrent/qtconcurrentmapkernel.h
@@ -75,10 +75,10 @@ public:
     bool runIterations(Iterator sequenceBeginIterator, int beginIndex, int endIndex, void *)
     {
         Iterator it = sequenceBeginIterator;
-        advance(it, beginIndex);
+        std::advance(it, beginIndex);
         for (int i = beginIndex; i < endIndex; ++i) {
             runIteration(it, i, 0);
-            advance(it, 1);
+            std::advance(it, 1);
         }
        
         return false;
@@ -129,10 +129,10 @@ public:
         results.vector.reserve(end - begin);
 
         Iterator it = sequenceBeginIterator;
-        advance(it, begin);
+        std::advance(it, begin);
         for (int i = begin; i < end; ++i) {
             results.vector.append(map(*(it)));
-            advance(it, 1);
+            std::advance(it, 1);
         }
 
         reducer.runReduce(reduce, reducedResult, results);
@@ -183,10 +183,10 @@ public:
     {
 
         Iterator it = sequenceBeginIterator;
-        advance(it, begin);
+        std::advance(it, begin);
         for (int i = begin; i < end; ++i) {
             runIteration(it, i, results + (i - begin));
-            advance(it, 1);
+            std::advance(it, 1);
         }
 
         return true;