summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-02-06 08:37:49 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-02-06 08:37:49 +0000
commitd25c64bbf23252154b17a1f95f40ec8ca001e307 (patch)
treea3c4f7909a8b9561ab43018f866734ff0844546b
parent7bb8a000a7e36e3bff3a6f5d9e709e737bd6e074 (diff)
parent4adfde41eae5b31724ec6092c1405b2913ab535c (diff)
Merge "Add android::base::expected::ok()"
-rw-r--r--base/include/android-base/expected.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/base/include/android-base/expected.h b/base/include/android-base/expected.h
index 44e0b4acb..9603bb1cf 100644
--- a/base/include/android-base/expected.h
+++ b/base/include/android-base/expected.h
@@ -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_); }