diff options
author | zijunzhao <zijunzhao@google.com> | 2023-03-03 18:55:38 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-03 18:55:38 +0000 |
commit | d81dc329e6e1d0629d8a26dee99f981adca13ebc (patch) | |
tree | a75ad047780c6d0b539c4d462af4cbe40ff4a6c1 | |
parent | 3a4a22496a8e8624b2a1560b09782c4f780f1ea1 (diff) | |
parent | 8defdbb4ef1d88ebd76e1268f4f31733f258e817 (diff) | |
download | libhwbinder-d81dc329e6e1d0629d8a26dee99f981adca13ebc.tar.gz |
Fix the missing std am: b858732354 am: da332d46c2 am: 63327e988e am: 8defdbb4efandroid-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-release
Original change: https://android-review.googlesource.com/c/platform/system/libhwbinder/+/2467700
Change-Id: I608f578ac28b47957c9a04a05b83abe025a1d402
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | vts/performance/Benchmark_throughput.cpp | 12 | ||||
-rw-r--r-- | vts/performance/Latency.cpp | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/vts/performance/Benchmark_throughput.cpp b/vts/performance/Benchmark_throughput.cpp index d197d2d..9011ba4 100644 --- a/vts/performance/Benchmark_throughput.cpp +++ b/vts/performance/Benchmark_throughput.cpp @@ -261,12 +261,12 @@ Pipe make_service(string service_name) { pid_t pid = fork(); if (pid) { /* parent */ - return move(get<0>(pipe_pair)); + return std::move(get<0>(pipe_pair)); } else { /* child */ - service_fx(service_name, move(get<1>(pipe_pair))); + service_fx(service_name, std::move(get<1>(pipe_pair))); /* never get here */ - return move(get<0>(pipe_pair)); + return std::move(get<0>(pipe_pair)); } } @@ -275,13 +275,13 @@ Pipe make_worker(int num, int iterations, int service_count, bool get_stub) { 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, iterations, service_count, get_stub, - move(get<1>(pipe_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/vts/performance/Latency.cpp b/vts/performance/Latency.cpp index 13a93ad..c63602d 100644 --- a/vts/performance/Latency.cpp +++ b/vts/performance/Latency.cpp @@ -162,14 +162,14 @@ static Pipe makeServiceProces(string service_name) { pid_t pid = fork(); if (pid) { // parent - return move(get<0>(pipe_pair)); + return std::move(get<0>(pipe_pair)); } else { threadDumpPri("service"); // child - serviceFx(service_name, move(get<1>(pipe_pair))); + serviceFx(service_name, std::move(get<1>(pipe_pair))); // never get here ASSERT(0); - return move(get<0>(pipe_pair)); + return std::move(get<0>(pipe_pair)); } } @@ -241,14 +241,14 @@ static Pipe makeClientProcess(int num, int iterations, int no_pair) { pid_t pid = fork(); if (pid) { // parent - return move(get<0>(pipe_pair)); + return std::move(get<0>(pipe_pair)); } else { // child threadDumpPri("client"); - clientFx(num, no_pair, iterations, move(get<1>(pipe_pair))); + clientFx(num, no_pair, iterations, std::move(get<1>(pipe_pair))); // never get here ASSERT(0); - return move(get<0>(pipe_pair)); + return std::move(get<0>(pipe_pair)); } } |