diff options
| author | Scott Lobdell <slobdell@google.com> | 2021-01-21 14:57:51 -0800 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2021-01-22 13:24:00 -0800 |
| commit | 7fd6edc3a3ff37a750641d5e192835fe217f6050 (patch) | |
| tree | 4369f3a76ed7ba782801984a51f7badb159a43c9 /tools/validatekeymaps/Main.cpp | |
| parent | d1a606fc7dfdbd4a3ded9d384a2b14f36f348c51 (diff) | |
| parent | d462c4768522d0a62f3bc6cf08158ac813bc09e6 (diff) | |
Merge SP1A.210105.001
Change-Id: Iebfaf27bb339a99d9303a53e6c2c397b0001c814
Diffstat (limited to 'tools/validatekeymaps/Main.cpp')
| -rw-r--r-- | tools/validatekeymaps/Main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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<std::shared_ptr<KeyLayoutMap>> 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<std::shared_ptr<KeyCharacterMap>> 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; |