diff --git a/tests/auto/algorithm/tst_algorithm.cpp b/tests/auto/algorithm/tst_algorithm.cpp index f87cc83a967..97581bb3d48 100644 --- a/tests/auto/algorithm/tst_algorithm.cpp +++ b/tests/auto/algorithm/tst_algorithm.cpp @@ -23,14 +23,16 @@ ** ****************************************************************************/ -#include - #include #include #include #include +// must get included after the containers above or gcc4.9 will have a problem using +// initializer_list related code on the templates inside algorithm.h +#include + class tst_Algorithm : public QObject { Q_OBJECT @@ -222,14 +224,14 @@ void tst_Algorithm::findOrDefault() v2.emplace_back(std::make_unique(3)); v2.emplace_back(std::make_unique(4)); QCOMPARE(Utils::findOrDefault(v2, [](const std::unique_ptr &ip) { return *ip == 2; }), v2.at(1).get()); - QCOMPARE(Utils::findOrDefault(v2, [](const std::unique_ptr &ip) { return *ip == 5; }), nullptr); + QCOMPARE(Utils::findOrDefault(v2, [](const std::unique_ptr &ip) { return *ip == 5; }), static_cast(0)); std::vector> v3; v3.emplace_back(std::make_unique(1)); v3.emplace_back(std::make_unique(3)); v3.emplace_back(std::make_unique(5)); v3.emplace_back(std::make_unique(7)); QCOMPARE(Utils::findOrDefault(v3, &Struct::isOdd), v3.at(0).get()); - QCOMPARE(Utils::findOrDefault(v3, &Struct::isEven), nullptr); + QCOMPARE(Utils::findOrDefault(v3, &Struct::isEven), static_cast(0)); } QTEST_MAIN(tst_Algorithm)