summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzijunzhao <zijunzhao@google.com>2023-03-03 19:23:04 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-03-03 19:23:04 +0000
commit04b6ad4a56c2ae5cd1ae0bb02471978473937f0f (patch)
treea75ad047780c6d0b539c4d462af4cbe40ff4a6c1
parent3a4a22496a8e8624b2a1560b09782c4f780f1ea1 (diff)
parent1b6ff55c18b2fcfa6fa1ad2dcc2003b2252a739b (diff)
downloadlibhwbinder-04b6ad4a56c2ae5cd1ae0bb02471978473937f0f.tar.gz
Fix the missing std am: b858732354 am: da332d46c2 am: 63327e988e am: 8defdbb4ef am: 1b6ff55c18
Original change: https://android-review.googlesource.com/c/platform/system/libhwbinder/+/2467700 Change-Id: Ic8d7f50948b9cf86f5be90853efc1099794d63bf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--vts/performance/Benchmark_throughput.cpp12
-rw-r--r--vts/performance/Latency.cpp12
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));
}
}