From c556cac5b6fc366502ed7f255fcc99918ce152c8 Mon Sep 17 00:00:00 2001 From: Jack Lloyd Date: Wed, 20 Dec 2017 09:42:36 -0500 Subject: Fix some shadow and unused parameter warnings --- src/lib/utils/socket/socket.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/utils/socket') diff --git a/src/lib/utils/socket/socket.cpp b/src/lib/utils/socket/socket.cpp index f263531dd..e7ed7e7e5 100644 --- a/src/lib/utils/socket/socket.cpp +++ b/src/lib/utils/socket/socket.cpp @@ -238,12 +238,12 @@ class BSD_Socket final : public OS::Socket int active = 0; if(nonblocking_connect_in_progress()) { - struct timeval timeout = make_timeout_tv(); + struct timeval timeout_tv = make_timeout_tv(); fd_set write_set; FD_ZERO(&write_set); FD_SET(m_socket, &write_set); - active = ::select(m_socket + 1, nullptr, &write_set, nullptr, &timeout); + active = ::select(m_socket + 1, nullptr, &write_set, nullptr, &timeout_tv); if(active) { -- cgit v1.2.3