diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-10 07:31:02 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-10 07:33:18 (GMT) |
| commit | 2d5381360cb3b63a840dfdc7078ce6156bc28e39 (patch) | |
| tree | 43a4d2bf8d5c43876337967f937c8a4536cabe7f /tests/auto/collections | |
| parent | 6631bb3c53ff89aefba9ac7fd742afa17f51c9c1 (diff) | |
| download | Qt-2d5381360cb3b63a840dfdc7078ce6156bc28e39.zip Qt-2d5381360cb3b63a840dfdc7078ce6156bc28e39.tar.gz Qt-2d5381360cb3b63a840dfdc7078ce6156bc28e39.tar.bz2 | |
Fixed collections autotests compilation for RVCT.
RVCT can't apparently handle forward declared template parameters if
those are used to declare class members inside templated class.
Diffstat (limited to 'tests/auto/collections')
| -rw-r--r-- | tests/auto/collections/tst_collections.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/auto/collections/tst_collections.cpp b/tests/auto/collections/tst_collections.cpp index 6102530..cb95c08 100644 --- a/tests/auto/collections/tst_collections.cpp +++ b/tests/auto/collections/tst_collections.cpp @@ -992,7 +992,7 @@ void tst_Collections::linkedList() QVERIFY(*(list.begin() + 2) == "alpha"); QVERIFY(*(list.begin() + 3) == "beta"); } - + { QLinkedList<int> a; QCOMPARE(a.startsWith(1), false); @@ -3453,7 +3453,7 @@ class Key1 class T1 {}; class T2 -}; +{}; #else class Key1; class T1; @@ -3468,7 +3468,11 @@ void tst_Collections::forwardDeclared() { typedef QMap<Key1, T1> C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) } { typedef QMultiMap<Key1, T1> C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) } #endif +#if !defined(Q_CC_RVCT) + // RVCT can't handle forward declared template parameters if those are used to declare + // class members inside templated class. { typedef QPair<T1, T2> C; C *x = 0; Q_UNUSED(x) } +#endif { typedef QList<T1> C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) } { typedef QLinkedList<T1> C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) } { typedef QVector<T1> C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) Q_UNUSED(i) Q_UNUSED(j) } |