From f1985df55dfa81f184c9d29df6cfbb353bf77ffc Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 13 Mar 2018 06:55:52 +0100 Subject: Tests: Fix compile for older compiler / Qt Change-Id: I96e48c446ebd397c75dc0b47f9aaef1717b5e5af Reviewed-by: Orgad Shaneh --- tests/auto/pointeralgorithm/tst_pointeralgorithm.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'tests/auto/pointeralgorithm/tst_pointeralgorithm.cpp') diff --git a/tests/auto/pointeralgorithm/tst_pointeralgorithm.cpp b/tests/auto/pointeralgorithm/tst_pointeralgorithm.cpp index 1e6404eb63..807d598655 100644 --- a/tests/auto/pointeralgorithm/tst_pointeralgorithm.cpp +++ b/tests/auto/pointeralgorithm/tst_pointeralgorithm.cpp @@ -285,23 +285,23 @@ void tst_PointerAlgorithm::take() { QList v {1, 3, 5, 6, 7, 8, 9, 11, 13, 15, 13, 16, 17}; Utils::optional r1 = Utils::take(v, [](const Struct &s) { return s.member == 13; }); - QVERIFY(r1); - QCOMPARE(r1.value(), 13); + QVERIFY(static_cast(r1)); + QCOMPARE(r1.value().member, 13); Utils::optional r2 = Utils::take(v, [](const Struct &s) { return s.member == 13; }); - QVERIFY(r2); - QCOMPARE(r2.value(), 13); + QVERIFY(static_cast(r2)); + QCOMPARE(r2.value().member, 13); Utils::optional r3 = Utils::take(v, [](const Struct &s) { return s.member == 13; }); - QVERIFY(!r3); + QVERIFY(!static_cast(r3)); Utils::optional r4 = Utils::take(v, &Struct::isEven); - QVERIFY(r4); - QCOMPARE(r4.value(), 6); + QVERIFY(static_cast(r4)); + QCOMPARE(r4.value().member, 6); } { QList v {0, 0, 0, 0, 0, 0, 1, 2, 3}; Utils::optional r1 = Utils::take(v, &Struct::member); - QVERIFY(r1); - QCOMPARE(r1.value(), 1); + QVERIFY(static_cast(r1)); + QCOMPARE(r1.value().member, 1); } } -- cgit v1.2.1