From 2e9be756cea30243bc6071d898f37933deaf4f12 Mon Sep 17 00:00:00 2001 From: Roger Meier Date: Tue, 8 Jul 2014 07:46:11 +0200 Subject: [PATCH] THRIFT-2610 MSVC warning in TSocket.cpp Patch: Konrad Grochowski --- lib/cpp/src/thrift/transport/TSocket.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/cpp/src/thrift/transport/TSocket.cpp b/lib/cpp/src/thrift/transport/TSocket.cpp index 7dec4420..e80f7128 100755 --- a/lib/cpp/src/thrift/transport/TSocket.cpp +++ b/lib/cpp/src/thrift/transport/TSocket.cpp @@ -622,7 +622,12 @@ void TSocket::setLinger(bool on, int linger) { return; } +#ifndef _WIN32 struct linger l = {(lingerOn_ ? 1 : 0), lingerVal_}; +#else + struct linger l = {(lingerOn_ ? 1 : 0), static_cast(lingerVal_)}; +#endif + int ret = setsockopt(socket_, SOL_SOCKET, SO_LINGER, cast_sockopt(&l), sizeof(l)); if (ret == -1) { int errno_copy = THRIFT_GET_SOCKET_ERROR; // Copy THRIFT_GET_SOCKET_ERROR because we're allocating memory. -- 2.17.1