feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Expected: Fix operator==(void, void)

Browse Source 
Change-Id: I883f05155f0710fc3a9f92a2e33d4f8722159016
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Marcus Tillmanns
2023-09-19 08:17:31 +02:00
parent bc1c24eb84
commit f1907836fa
2 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/libs/3rdparty/tl_expected/include/tl/expected.hpp vendored
View File

@@ -2278,6 +2278,14 @@ detail::decay_t<Exp> or_else_impl(Exp &&exp, F &&f) {
#endif #endif
} // namespace detail } // namespace detail
template <class E, class F>
constexpr bool operator==(const expected<void, E> &lhs,
const expected<void, F> &rhs) {
return (lhs.has_value() != rhs.has_value())
? false
: (!lhs.has_value() ? lhs.error() == rhs.error() : true);
}
template <class T, class E, class U, class F> template <class T, class E, class U, class F>
constexpr bool operator==(const expected<T, E> &lhs, constexpr bool operator==(const expected<T, E> &lhs,
const expected<U, F> &rhs) { const expected<U, F> &rhs) {
@@ -2292,6 +2300,13 @@ constexpr bool operator!=(const expected<T, E> &lhs,
? true ? true
: (!lhs.has_value() ? lhs.error() != rhs.error() : *lhs != *rhs); : (!lhs.has_value() ? lhs.error() != rhs.error() : *lhs != *rhs);
} }
template<class E, class F>
constexpr bool operator!=(const expected<void, E> &lhs, const expected<void, F> &rhs)
{
return (lhs.has_value() != rhs.has_value())
? true
: (!lhs.has_value() ? lhs.error() != rhs.error() : false);
}
template <class T, class E, class U> template <class T, class E, class U>
constexpr bool operator==(const expected<T, E> &x, const U &v) { constexpr bool operator==(const expected<T, E> &x, const U &v) {

19
tests/auto/utils/expected/tst_expected.cpp
View File

@@ -32,6 +32,25 @@ private slots:
QVERIFY(!result); QVERIFY(!result);
} }
void tryCompareVoid()
{
tl::expected<void, QString> e1;
QVERIFY(e1 == e1);
tl::expected<void, QString> e2 = make_unexpected("error");
QVERIFY(e1 != e2);
e1 = make_unexpected(QString("error"));
QVERIFY(e1 == e2);
e2 = {};
QVERIFY(e1 != e2);
e1 = {};
QVERIFY(e1 == e2);
QVERIFY(!(e1 != e2));
}
}; };
QTEST_GUILESS_MAIN(tst_expected) QTEST_GUILESS_MAIN(tst_expected)