tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "expected.h - fix bugprone-branch-clone warning" into rvc-dev

Browse source
This commit is contained in:
TreeHugger Robot 2020-04-24 02:39:42 +00:00 committed by Android (Google) Code Review
commit 61e2b0104a
1 changed files with 12 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
base/include/android-base/expected.h
View file

@ -387,13 +387,9 @@ class _NODISCARD_ expected {
template<class T1, class E1, class T2, class E2>
constexpr bool operator==(const expected<T1, E1>& x, const expected<T2, E2>& y) {
if (x.has_value() != y.has_value()) {
return false;
} else if (!x.has_value()) {
return x.error() == y.error();
} else {
return *x == *y;
}
if (x.has_value() != y.has_value()) return false;
if (!x.has_value()) return x.error() == y.error();
return *x == *y;
}
template<class T1, class E1, class T2, class E2>
@ -581,35 +577,23 @@ class _NODISCARD_ expected<void, E> {
template<class E1, class E2>
constexpr bool operator==(const expected<void, E1>& x, const expected<void, E2>& y) {
if (x.has_value() != y.has_value()) {
return false;
} else if (!x.has_value()) {
return x.error() == y.error();
} else {
return true;
}
if (x.has_value() != y.has_value()) return false;
if (!x.has_value()) return x.error() == y.error();
return true;
}
template<class T1, class E1, class E2>
constexpr bool operator==(const expected<T1, E1>& x, const expected<void, E2>& y) {
if (x.has_value() != y.has_value()) {
return false;
} else if (!x.has_value()) {
return x.error() == y.error();
} else {
return false;
}
if (x.has_value() != y.has_value()) return false;
if (!x.has_value()) return x.error() == y.error();
return false;
}
template<class E1, class T2, class E2>
constexpr bool operator==(const expected<void, E1>& x, const expected<T2, E2>& y) {
if (x.has_value() != y.has_value()) {
return false;
} else if (!x.has_value()) {
return x.error() == y.error();
} else {
return false;
}
if (x.has_value() != y.has_value()) return false;
if (!x.has_value()) return x.error() == y.error();
return false;
}
template<class E>