diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-08-03 10:48:13 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-08-03 10:48:13 +0000 |
commit | 44e215b5360cc80e7211333f1e3d1fff2ab6df08 (patch) | |
tree | 889ff825444f82119671a9a726fa1163eca6b338 | |
parent | 6a27a38cf032dd72af7d32b06939078471fbe102 (diff) | |
parent | 4e21d361e997d747fc768e7510f8fd95286da0ce (diff) | |
download | native-44e215b5360cc80e7211333f1e3d1fff2ab6df08.tar.gz |
Merge "Fix unqualified-std-cast-call compiler warning" am: 4e21d361e9
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2173682
Change-Id: I58ecff9406bba764d2cb60c941b6a83178ad3d31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | libs/binder/tests/binderThroughputTest.cpp | 7 | ||||
-rw-r--r-- | libs/binder/tests/schd-dbg.cpp | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libs/binder/tests/binderThroughputTest.cpp b/libs/binder/tests/binderThroughputTest.cpp index 3b1faa8c2f..cfaf2a987f 100644 --- a/libs/binder/tests/binderThroughputTest.cpp +++ b/libs/binder/tests/binderThroughputTest.cpp @@ -249,12 +249,13 @@ Pipe make_worker(int num, int iterations, int worker_count, int payload_size, bo pid_t pid = fork(); if (pid) { /* parent */ - return move(get<0>(pipe_pair)); + return std::move(get<0>(pipe_pair)); } else { /* child */ - worker_fx(num, worker_count, iterations, payload_size, cs_pair, move(get<1>(pipe_pair))); + worker_fx(num, worker_count, iterations, payload_size, cs_pair, + std::move(get<1>(pipe_pair))); /* never get here */ - return move(get<0>(pipe_pair)); + return std::move(get<0>(pipe_pair)); } } diff --git a/libs/binder/tests/schd-dbg.cpp b/libs/binder/tests/schd-dbg.cpp index 56d958c6be..0035e4ee5a 100644 --- a/libs/binder/tests/schd-dbg.cpp +++ b/libs/binder/tests/schd-dbg.cpp @@ -398,14 +398,13 @@ Pipe make_process(int num, int iterations, int no_process, int payload_size) { pid_t pid = fork(); if (pid) { // parent - return move(get<0>(pipe_pair)); + return std::move(get<0>(pipe_pair)); } else { // child thread_dump(is_client(num) ? "client" : "server"); - worker_fx(num, no_process, iterations, payload_size, - move(get<1>(pipe_pair))); + worker_fx(num, no_process, iterations, payload_size, std::move(get<1>(pipe_pair))); // never get here - return move(get<0>(pipe_pair)); + return std::move(get<0>(pipe_pair)); } } |