diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2018-11-15 08:24:20 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2018-11-15 08:24:20 +0100 |
| commit | 1ced32aaad9731c1fc14e232dc6463159b3d48d5 (patch) | |
| tree | 6cafbc5c62c564dfe7a0d27c2f6254c3485c2264 /cpp/src/Ice/TcpAcceptor.cpp | |
| parent | Set slice output to avoid warning with Android Studio (diff) | |
| download | ice-1ced32aaad9731c1fc14e232dc6463159b3d48d5.tar.bz2 ice-1ced32aaad9731c1fc14e232dc6463159b3d48d5.tar.xz ice-1ced32aaad9731c1fc14e232dc6463159b3d48d5.zip | |
Fixed SOCKET_ERROR assignement with DWORD, fixes #267
Diffstat (limited to 'cpp/src/Ice/TcpAcceptor.cpp')
| -rwxr-xr-x | cpp/src/Ice/TcpAcceptor.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/Ice/TcpAcceptor.cpp b/cpp/src/Ice/TcpAcceptor.cpp index 4dfcb427e42..e0a6f053318 100755 --- a/cpp/src/Ice/TcpAcceptor.cpp +++ b/cpp/src/Ice/TcpAcceptor.cpp @@ -131,6 +131,7 @@ IceInternal::TcpAcceptor::startAccept() assert(_acceptFd == INVALID_SOCKET); _acceptFd = createSocket(false, _addr); const int sz = static_cast<int>(_acceptBuf.size() / 2); + _info.error = ERROR_SUCCESS; if(!AcceptEx(_fd, _acceptFd, &_acceptBuf[0], 0, sz, sz, &_info.count, &_info)) { if(!wouldBlock()) @@ -143,7 +144,7 @@ IceInternal::TcpAcceptor::startAccept() void IceInternal::TcpAcceptor::finishAccept() { - if(static_cast<int>(_info.count) == SOCKET_ERROR || _fd == INVALID_SOCKET) + if(_info.error != ERROR_SUCCESS || _fd == INVALID_SOCKET) { closeSocketNoThrow(_acceptFd); _acceptFd = INVALID_SOCKET; |