OSDN Git Service

DO NOT MERGE Remove "if (auto ret = " treated as unused by some compilers
authorRobin Lee <rgl@google.com>
Thu, 1 Dec 2016 19:03:33 +0000 (19:03 +0000)
committerMichal Karpinski <mkarpinski@google.com>
Fri, 2 Dec 2016 16:11:19 +0000 (16:11 +0000)
It's not good form to have a variable that's created and used only once
in the same line anyway, so the compilers that flag it are probably in
the right.

Test: netd_benchmark
Bug: 29748723

(cherry picked from commit e65244b5a149fc8be8063ee0872f31b829bfa020)

Change-Id: I80b8c321087947c08d5d5b9cb6ca7b4987b2ac77

tests/benchmarks/connect_benchmark.cpp

index 9997d3a..56795d2 100644 (file)
@@ -82,7 +82,7 @@ static void ipv4_loopback(benchmark::State& state, const bool waitBetweenRuns) {
         const Stopwatch stopwatch;
 
         sockaddr_in server = { .sin_family = AF_INET, .sin_port = htons(port) };
-        if (auto ret = connect(sock, (sockaddr*) &server, sizeof(server))) {
+        if (connect(sock, (sockaddr*) &server, sizeof(server))) {
             state.SkipWithError(StringPrintf("connect() failed with errno=%d", errno).c_str());
             close(sock);
             break;
@@ -139,7 +139,7 @@ static void ipv6_loopback(benchmark::State& state, const bool waitBetweenRuns) {
         const Stopwatch stopwatch;
 
         sockaddr_in6 server = { .sin6_family = AF_INET6, .sin6_port = htons(port) };
-        if (auto ret = connect(sock, (sockaddr*) &server, sizeof(server))) {
+        if (connect(sock, (sockaddr*) &server, sizeof(server))) {
             state.SkipWithError(StringPrintf("connect() failed with errno=%d", errno).c_str());
             close(sock);
             break;