diff options
| author | miniak <milan.burda@gmail.com> | 2010-08-03 18:33:10 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-08-03 18:35:27 +0200 |
| commit | 02e5a6c9abe9562ce2b2057c0b89f65d371c5b40 (patch) | |
| tree | ae4003d02e81a30a4727556ce60a8259038a55dc /src/corelib/concurrent | |
| parent | b9328bd135a3556cef2438fa049fb9e1d7cbb977 (diff) | |
It is no longer necessary to check for QT_NO_PARTIAL_TEMPLATE_SPECIALIZATION
Merge-request: 756
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Diffstat (limited to 'src/corelib/concurrent')
| -rw-r--r-- | src/corelib/concurrent/qtconcurrentiteratekernel.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/corelib/concurrent/qtconcurrentiteratekernel.h b/src/corelib/concurrent/qtconcurrentiteratekernel.h index 23aaae8a36..29d276be98 100644 --- a/src/corelib/concurrent/qtconcurrentiteratekernel.h +++ b/src/corelib/concurrent/qtconcurrentiteratekernel.h @@ -184,12 +184,9 @@ public: #if defined (QT_NO_STL) : begin(_begin), end(_end), current(_begin), currentIndex(0), forIteration(false), progressReportingEnabled(true) -#elif !defined(QT_NO_PARTIAL_TEMPLATE_SPECIALIZATION) +#else : begin(_begin), end(_end), current(_begin), currentIndex(0), forIteration(selectIteration(typename std::iterator_traits<Iterator>::iterator_category())), progressReportingEnabled(true) -#else - : begin(_begin), end(_end), currentIndex(0), - forIteration(selectIteration(std::iterator_category(_begin))), progressReportingEnabled(true) #endif { #if defined (QT_NO_STL) |