commit 69372a67f278f60782dcb7089d1c56a6fe03e83b
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jan 07 00:47:02 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 07 00:47:02 2022 +0000
tree 6806349ad58b61fbb97970ab488fe876bc603193
parent 82983d78770fb93aaafd39b5a3060dff25345ee8
parent e1ac304dc60ce049135883eb2bd6a88797fc880b

Merge "Remove ambiguity when using error().code()."

staticlibs/netd/libnetdutils/include/netdutils/Status.h

diff --git a/staticlibs/netd/libnetdutils/include/netdutils/Status.h b/staticlibs/netd/libnetdutils/include/netdutils/Status.h
index bc347d5..7b0bd47 100644
--- a/staticlibs/netd/libnetdutils/include/netdutils/Status.h
+++ b/staticlibs/netd/libnetdutils/include/netdutils/Status.h
@@ -42,7 +42,7 @@
     Status(int code, std::string msg) : mCode(code), mMsg(std::move(msg)) { assert(!ok()); }
 
     Status(android::base::Result<void> result)
-        : mCode(result.ok() ? 0 : result.error().code()),
+        : mCode(result.ok() ? 0 : static_cast<int>(result.error().code())),
           mMsg(result.ok() ? "" : result.error().message()) {}
 
     int code() const { return mCode; }