diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-07-16 13:38:27 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-07 11:20:35 (GMT) |
| commit | 923134936e132e857b663c4837f66565dfa3d9e6 (patch) | |
| tree | ccd80e1cfc270d228f55376df230f970e2881d2c | |
| parent | 79c488a28819b58eed519fb3df2705b8c6e35e05 (diff) | |
| download | Qt-923134936e132e857b663c4837f66565dfa3d9e6.zip Qt-923134936e132e857b663c4837f66565dfa3d9e6.tar.gz Qt-923134936e132e857b663c4837f66565dfa3d9e6.tar.bz2 | |
xlC 7 cannot compile QtConcurrent with these templates here
(cherry picked from commit cb64ac587249f5dc6563a035e2ef5a3ad2bc5d13)
| -rw-r--r-- | src/corelib/concurrent/qfuture.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/concurrent/qfuture.h b/src/corelib/concurrent/qfuture.h index 47015ee..f2db5ac 100644 --- a/src/corelib/concurrent/qfuture.h +++ b/src/corelib/concurrent/qfuture.h @@ -210,7 +210,7 @@ public: bool operator==(const QFuture &other) const { return (d == other.d); } bool operator!=(const QFuture &other) const { return (d != other.d); } -#ifndef QT_NO_MEMBER_TEMPLATES +#if !defined(QT_NO_MEMBER_TEMPLATES) && !defined(Q_CC_XLC) template <typename T> QFuture(const QFuture<T> &other) : d(other.d) |