From fbc9afb0846cd7404e874f98912d5ca67bf9e977 Mon Sep 17 00:00:00 2001 From: Bernie Innocenti Date: Tue, 22 Dec 2020 20:10:32 +0900 Subject: Add explicit Result::ok() where missing This is part of a large-scale cleanup to remove operator bool() from android::base::expected. For more details, see aosp/1533001. Bug: 176148206 Test: m checkbuild continuous_instrumentation_tests continuous_instrumentation_tests_api_coverage continuous_native_tests device-tests platform_tests Exempt-From-Owner-Approval: mechanical large-scale change Change-Id: Ie8cf279c20c9284ad6476280e80dc25545f833de --- tools/validatekeymaps/Main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/validatekeymaps/Main.cpp') diff --git a/tools/validatekeymaps/Main.cpp b/tools/validatekeymaps/Main.cpp index 950473d223fd..991b28071515 100644 --- a/tools/validatekeymaps/Main.cpp +++ b/tools/validatekeymaps/Main.cpp @@ -96,7 +96,7 @@ static bool validateFile(const char* filename) { case FileType::KEY_LAYOUT: { base::Result> ret = KeyLayoutMap::load(filename); - if (!ret) { + if (!ret.ok()) { error("Error %s parsing key layout file.\n\n", ret.error().message().c_str()); return false; } @@ -106,7 +106,7 @@ static bool validateFile(const char* filename) { case FileType::KEY_CHARACTER_MAP: { base::Result> ret = KeyCharacterMap::load(filename, KeyCharacterMap::Format::ANY); - if (!ret) { + if (!ret.ok()) { error("Error %s parsing key character map file.\n\n", ret.error().message().c_str()); return false; -- cgit v1.2.3-59-g8ed1b