commit 91c51e4f06b49433462580ed9b7440dec90d2e48
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 06 09:05:15 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 06 09:05:15 2020 +0000
tree a3c4f7909a8b9561ab43018f866734ff0844546b
parent 6e568ade83c9142e73737217db4732015894e9f1
parent 143854d5b40167f77fa8187bfd115c877a750009

Merge "Add android::base::expected::ok()" am: d25c64bbf2 am: 4a1a3880d9

Change-Id: I9603edcd21cd8f5d2a4d025ac09f28019a95ed31

base/include/android-base/expected.h

diff --git a/base/include/android-base/expected.h b/base/include/android-base/expected.h
index 44e0b4a..9603bb1 100644
--- a/base/include/android-base/expected.h
+++ b/base/include/android-base/expected.h
@@ -331,6 +331,7 @@
 
   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 @@
   // 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_); }