summaryrefslogtreecommitdiffstats
path: root/tests/auto/collections/tst_collections.cpp
diff options
context:
space:
mode:
authorminiak <milan.burda@gmail.com>2010-08-03 16:33:07 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2010-08-03 16:35:26 (GMT)
commit8435ba93fad9eb799764eb3b66a8a9838db3fea3 (patch)
treef69cbdba60b3a43344e9a518eeddb557606c8186 /tests/auto/collections/tst_collections.cpp
parent794c7c77f28bb530db017cc25a5e33e00933253b (diff)
downloadQt-8435ba93fad9eb799764eb3b66a8a9838db3fea3.zip
Qt-8435ba93fad9eb799764eb3b66a8a9838db3fea3.tar.gz
Qt-8435ba93fad9eb799764eb3b66a8a9838db3fea3.tar.bz2
Remove obsolete code & workarounds for unsupported versions of MS Visual C++
The minimum supported version of MS Visual C++ 2003, which is _MSC_VER 1310. Merge-request: 756 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Diffstat (limited to 'tests/auto/collections/tst_collections.cpp')
-rw-r--r--tests/auto/collections/tst_collections.cpp11
1 files changed, 0 insertions, 11 deletions
diff --git a/tests/auto/collections/tst_collections.cpp b/tests/auto/collections/tst_collections.cpp
index d092c34..4ecd392 100644
--- a/tests/auto/collections/tst_collections.cpp
+++ b/tests/auto/collections/tst_collections.cpp
@@ -3447,27 +3447,16 @@ void tst_Collections::containerTypedefs()
testSetContainerTypedefs(QSet<int>());
}
-#if defined(Q_CC_MSVC) && !defined(Q_CC_MSVC_NET)
-class Key1
-{};
-class T1
-{};
-class T2
-{};
-#else
class Key1;
class T1;
class T2;
-#endif
void tst_Collections::forwardDeclared()
{
{ typedef QHash<Key1, T1> C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) }
{ typedef QMultiHash<Key1, T1> C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) }
-#if !defined(Q_CC_MSVC_NET) || _MSC_VER >= 1310
{ 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.