Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4979a4af authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "expected.h - fix bugprone-branch-clone warning" into rvc-dev am: 61e2b010 

Change-Id: I2f08ff00903b78a20309f52b880283310926e485
parents bba9c378 61e2b010

base/include/android-base/expected.h

+12 −28
Original line number Diff line number Diff line
@@ -387,14 +387,10 @@ 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 {

  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>

constexpr bool operator!=(const expected<T1, E1>& x, const expected<T2, E2>& y) {
@@ -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 {

  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()) {

  if (x.has_value() != y.has_value()) return false;

  if (!x.has_value()) return x.error() == y.error();

  return false;

  } else if (!x.has_value()) {

    return x.error() == y.error();

  } else {

    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()) {

  if (x.has_value() != y.has_value()) return false;

  if (!x.has_value()) return x.error() == y.error();

  return false;

  } else if (!x.has_value()) {

    return x.error() == y.error();

  } else {

    return false;

  }

}



template<class E>