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

Commit 4a1a3880 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add android::base::expected::ok()" am: d25c64bb 

Change-Id: I83fed8202fcb0d839bc2bf21eb1054dc5bff31eb
parents 4985ec30 d25c64bb

base/include/android-base/expected.h

+2 −0
Original line number Diff line number Diff line
@@ -331,6 +331,7 @@ class _NODISCARD_ expected { 


  constexpr explicit operator bool() const noexcept { return has_value(); }

  constexpr bool has_value() const noexcept { return var_.index() == 0; }

  constexpr bool ok() const noexcept { return has_value(); }



  constexpr const T& value() const& { return std::get<T>(var_); }

  constexpr T& value() & { return std::get<T>(var_); }
@@ -557,6 +558,7 @@ class _NODISCARD_ expected<void, E> { 
  // observers

  constexpr explicit operator bool() const noexcept { return has_value(); }

  constexpr bool has_value() const noexcept { return var_.index() == 0; }

  constexpr bool ok() const noexcept { return has_value(); }



  constexpr void value() const& { if (!has_value()) std::get<0>(var_); }