Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4a87f2e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix unqualified-std-cast-call compiler warning" am: 4e21d361 am: 44e215b5 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2173682



Change-Id: If3a388dae19f10d336168900585ec686190e6bc3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dbf21e59 44e215b5

libs/binder/tests/binderThroughputTest.cpp

+4 −3
Original line number Diff line number Diff line
@@ -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));

    }



}

libs/binder/tests/schd-dbg.cpp

+3 −4
Original line number Diff line number Diff line
@@ -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));

  }

}