1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QtConcurrent: remove a using declaration in a header file

Browse Source 
See Sutter/Alexandrescu, Item 59, for rationale.

Change-Id: Ie689e2a00f9ed0fce1ccfdb77c943dd1b1beb4dc
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
This commit is contained in:
Marc Mutz 2013-10-04 15:33:00 +02:00 committed by The Qt Project
parent c012ee2940
commit 0206c1e4e7
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/concurrent/qtconcurrentfilterkernel.h
View File

@ -120,11 +120,11 @@ public:
typename Sequence::const_iterator it = sequenceBeginIterator; typename Sequence::const_iterator it = sequenceBeginIterator;
advance(it, begin); std::advance(it, begin);
for (int i = begin; i < end; ++i) { for (int i = begin; i < end; ++i) {
if (keep(*it)) if (keep(*it))
results.vector.append(*it); results.vector.append(*it);
advance(it, 1); std::advance(it, 1);
} }
reducer.runReduce(reduce, reducedResult, results); reducer.runReduce(reduce, reducedResult, results);
@ -206,11 +206,11 @@ public:
results.vector.reserve(end - begin); results.vector.reserve(end - begin);
Iterator it = sequenceBeginIterator; Iterator it = sequenceBeginIterator;
advance(it, begin); std::advance(it, begin);
for (int i = begin; i < end; ++i) { for (int i = begin; i < end; ++i) {
if (keep(*it)) if (keep(*it))
results.vector.append(*it); results.vector.append(*it);
advance(it, 1); std::advance(it, 1);
} }
reducer.runReduce(reduce, reducedResult, results); reducer.runReduce(reduce, reducedResult, results);
@ -282,11 +282,11 @@ public:
results.vector.reserve(count); results.vector.reserve(count);
Iterator it = sequenceBeginIterator; Iterator it = sequenceBeginIterator;
advance(it, begin); std::advance(it, begin);
for (int i = begin; i < end; ++i) { for (int i = begin; i < end; ++i) {
if (keep(*it)) if (keep(*it))
results.vector.append(*it); results.vector.append(*it);
advance(it, 1); std::advance(it, 1);
} }
this->reportResults(results.vector, begin, count); this->reportResults(results.vector, begin, count);

2
src/concurrent/qtconcurrentiteratekernel.h
View File

@ -59,8 +59,6 @@ QT_BEGIN_NAMESPACE
namespace QtConcurrent { namespace QtConcurrent {
using std::advance;
/* /*
The BlockSizeManager class manages how many iterations a thread should The BlockSizeManager class manages how many iterations a thread should
reserve and process at a time. This is done by measuring the time spent reserve and process at a time. This is done by measuring the time spent

12
src/concurrent/qtconcurrentmapkernel.h
View File

@ -75,10 +75,10 @@ public:
bool runIterations(Iterator sequenceBeginIterator, int beginIndex, int endIndex, void *) bool runIterations(Iterator sequenceBeginIterator, int beginIndex, int endIndex, void *)
{ {
Iterator it = sequenceBeginIterator; Iterator it = sequenceBeginIterator;
advance(it, beginIndex); std::advance(it, beginIndex);
for (int i = beginIndex; i < endIndex; ++i) { for (int i = beginIndex; i < endIndex; ++i) {
runIteration(it, i, 0); runIteration(it, i, 0);
advance(it, 1); std::advance(it, 1);
} }
return false; return false;
@ -129,10 +129,10 @@ public:
results.vector.reserve(end - begin); results.vector.reserve(end - begin);
Iterator it = sequenceBeginIterator; Iterator it = sequenceBeginIterator;
advance(it, begin); std::advance(it, begin);
for (int i = begin; i < end; ++i) { for (int i = begin; i < end; ++i) {
results.vector.append(map(*(it))); results.vector.append(map(*(it)));
advance(it, 1); std::advance(it, 1);
} }
reducer.runReduce(reduce, reducedResult, results); reducer.runReduce(reduce, reducedResult, results);
@ -183,10 +183,10 @@ public:
{ {
Iterator it = sequenceBeginIterator; Iterator it = sequenceBeginIterator;
advance(it, begin); std::advance(it, begin);
for (int i = begin; i < end; ++i) { for (int i = begin; i < end; ++i) {
runIteration(it, i, results + (i - begin)); runIteration(it, i, results + (i - begin));
advance(it, 1); std::advance(it, 1);
} }
return true; return true;