diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:12:21 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:12:35 +0200 |
| commit | d0eb444a49f6064ecb896f62276e060cd8a4b1e8 (patch) | |
| tree | 34d8dd637baf665225ada73e76604531cd2c75e5 /src/concurrent/qtconcurrentmapkernel.h | |
| parent | da0cb32b8ee7cc4a991a59420a411898e63a660e (diff) | |
| parent | 894f86709080fe8d20875b402adce679963c49c2 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ib8cfeee7d9ca15e8ad520e428b72c200827a8628
Diffstat (limited to 'src/concurrent/qtconcurrentmapkernel.h')
| -rw-r--r-- | src/concurrent/qtconcurrentmapkernel.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/concurrent/qtconcurrentmapkernel.h b/src/concurrent/qtconcurrentmapkernel.h index 6817cd3e295..36e9cd3527e 100644 --- a/src/concurrent/qtconcurrentmapkernel.h +++ b/src/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; |