Testlib: Remove overload qCompare(bool, int, ...).
It was added for NokiaX86 / RVCT compilers and may produce unexpected results with g++, where it matches for qCompare(int, enum). Task-number: QTBUG-47260 Change-Id: Ia29b9ae289c6df579a923aef6eb67e46db0b1120 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Jason McDonald <macadder1@gmail.com>
This commit is contained in:
parent
15a5035671
commit
57ae1b15b6
@ -409,14 +409,6 @@ namespace QTest
|
||||
return compare_string_helper(t1, t2, actual, expected, file, line);
|
||||
}
|
||||
|
||||
// NokiaX86 and RVCT do not like implicitly comparing bool with int
|
||||
inline bool qCompare(bool const &t1, int const &t2,
|
||||
const char *actual, const char *expected, const char *file, int line)
|
||||
{
|
||||
return qCompare(int(t1), t2, actual, expected, file, line);
|
||||
}
|
||||
|
||||
|
||||
template <class T>
|
||||
inline bool qTest(const T& actual, const char *elementName, const char *actualStr,
|
||||
const char *expected, const char *file, int line)
|
||||
|
Loading…
Reference in New Issue
Block a user