From 2d5381360cb3b63a840dfdc7078ce6156bc28e39 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Mon, 10 Aug 2009 10:31:02 +0300 Subject: 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. --- tests/auto/collections/tst_collections.cpp | 8 ++++++-- 1 file 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 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 C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) } { typedef QMultiMap 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 C; C *x = 0; Q_UNUSED(x) } +#endif { typedef QList C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) } { typedef QLinkedList C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) } { typedef QVector C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) Q_UNUSED(i) Q_UNUSED(j) } -- cgit v0.12