diff options
author | Yifan Hong <elsk@google.com> | 2017-02-21 18:25:00 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-02-21 18:25:01 +0000 |
commit | c38d4f183c53d66f07d3e52aea74d75a2a294053 (patch) | |
tree | 9efd8f703363d9f5d059876467dd98691b0d7f50 | |
parent | ff972054e9a876a79fbe6a3ba075536e621234ed (diff) | |
parent | 83a2fdb4e10b9c308d470fd3bc99f483fc0af2bd (diff) | |
download | extras-c38d4f183c53d66f07d3e52aea74d75a2a294053.tar.gz |
Merge "bootctl: Return<T> is non-copyable."
-rw-r--r-- | bootctl/bootctl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bootctl/bootctl.cpp b/bootctl/bootctl.cpp index 2b3865e5..6dda28fb 100644 --- a/bootctl/bootctl.cpp +++ b/bootctl/bootctl.cpp @@ -83,7 +83,7 @@ static std::function<void(CommandResult)> generate_callback(CommandResult *crp) }; } -static int handle_return(Return<void> ret, CommandResult cr, const char* errStr) { +static int handle_return(const Return<void> &ret, CommandResult cr, const char* errStr) { if (!ret.isOk()) { fprintf(stderr, errStr, ret.description().c_str()); return EX_SOFTWARE; @@ -117,7 +117,7 @@ static int do_set_slot_as_unbootable(sp<IBootControl> module, return handle_return(ret, cr, "Error setting slot as unbootable: %s\n"); } -static int handle_return(Return<BoolResult> ret, const char* errStr) { +static int handle_return(const Return<BoolResult> &ret, const char* errStr) { if (!ret.isOk()) { fprintf(stderr, errStr, ret.description().c_str()); return EX_SOFTWARE; |