From 0e125753e9054832a85511bb8c48272e603fceb5 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 4 Oct 2016 12:41:07 -0700 Subject: [PATCH] folly/io/async/AsyncSocket.cpp: avoid shadowing warning for "rv" Summary: Enabling the proposed-for-upstream gcc -Wshadow-local option exposes this shadowing: ``` folly/io/async/AsyncSocket.cpp: In member function 'virtual void folly::AsyncSocket::connect(folly::AsyncSocket::ConnectCallback*, const folly::SocketAddress&, int, const OptionMap&, const folly::SocketAddress&)': folly/io/async/AsyncSocket.cpp:421:11: error: declaration of 'rv' shadows a previous local [-Werror=shadow-compatible-local] folly/io/async/AsyncSocket.cpp:364:9: error: shadowed declaration is here [-Werror=shadow-compatible-local] ``` Reviewed By: ngoyal, knekritz Differential Revision: D3963873 fbshipit-source-id: 85b3ab1fc3b200b81615a00d66a183cc9c792a90 --- folly/io/async/AsyncSocket.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/folly/io/async/AsyncSocket.cpp b/folly/io/async/AsyncSocket.cpp index bb41685d..b1bbba24 100644 --- a/folly/io/async/AsyncSocket.cpp +++ b/folly/io/async/AsyncSocket.cpp @@ -418,7 +418,7 @@ void AsyncSocket::connect(ConnectCallback* callback, // Apply the additional options if any. for (const auto& opt: options) { - int rv = opt.first.apply(fd_, opt.second); + rv = opt.first.apply(fd_, opt.second); if (rv != 0) { auto errnoCopy = errno; throw AsyncSocketException( -- 2.34.1