diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2012-02-25 13:52:31 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-14 14:21:01 +0100 |
| commit | 6ec0823fd1802988a8ca84e361abc68107723171 (patch) | |
| tree | eaaf566c0dd2a4d854d3bea054e374ce18cb24cd /src/testlib/qtestcase.h | |
| parent | cd27535ca048a671fc6d2e5fdc9c0727b065c097 (diff) | |
Remove QTEST_NO_SPECIALIZATIONS
We don't support these compiler anymore
Change-Id: I0eb73535b6c11703299430e5fc24c8e17fed1653
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'src/testlib/qtestcase.h')
| -rw-r--r-- | src/testlib/qtestcase.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index a344736f7b..acd494965e 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -256,7 +256,6 @@ namespace QTest QTEST_COMPARE_DECL(bool) #endif -#ifndef QTEST_NO_SPECIALIZATIONS template <typename T1, typename T2> bool qCompare(T1 const &, T2 const &, const char *, const char *, const char *, int); @@ -312,34 +311,17 @@ namespace QTest { return compare_string_helper(t1, t2, actual, expected, file, line); } -#else /* QTEST_NO_SPECIALIZATIONS */ - inline bool qCompare(const char *t1, const char *t2, const char *actual, - const char *expected, const char *file, int line) - { - return compare_string_helper(t1, t2, actual, expected, file, line); - } - - inline bool qCompare(char *t1, char *t2, const char *actual, const char *expected, - const char *file, int line) - { - return compare_string_helper(t1, t2, actual, expected, file, line); - } -#endif /* The next two specializations are for MSVC that shows problems with implicit conversions */ -#ifndef QTEST_NO_SPECIALIZATIONS template<> -#endif inline bool qCompare(char *t1, const char *t2, const char *actual, const char *expected, const char *file, int line) { return compare_string_helper(t1, t2, actual, expected, file, line); } -#ifndef QTEST_NO_SPECIALIZATIONS template<> -#endif inline bool qCompare(const char *t1, char *t2, const char *actual, const char *expected, const char *file, int line) { @@ -347,9 +329,7 @@ namespace QTest } // NokiaX86 and RVCT do not like implicitly comparing bool with int -#ifndef QTEST_NO_SPECIALIZATIONS template <> -#endif inline bool qCompare(bool const &t1, int const &t2, const char *actual, const char *expected, const char *file, int line) { |