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/ThreadPool.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/ThreadPool.cpp')
| -rw-r--r-- | cpp/src/Ice/ThreadPool.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp index dc965a78033..cc70d9c2033 100644 --- a/cpp/src/Ice/ThreadPool.cpp +++ b/cpp/src/Ice/ThreadPool.cpp @@ -765,8 +765,8 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread) #ifdef ICE_OS_UWP current._handler = ICE_GET_SHARED_FROM_THIS(_selector.getNextHandler(current.operation, _threadIdleTime)); #else - current._handler = ICE_GET_SHARED_FROM_THIS(_selector.getNextHandler(current.operation, current._count, current._error, - _threadIdleTime)); + current._handler = ICE_GET_SHARED_FROM_THIS(_selector.getNextHandler(current.operation, current._count, + current._error, _threadIdleTime)); #endif } catch(const SelectorTimeoutException&) @@ -817,7 +817,7 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread) #else current._handler = ICE_GET_SHARED_FROM_THIS(_selector.getNextHandler(current.operation, current._count, - current._error, _serverIdleTime)); + current._error, _serverIdleTime)); #endif } catch(const SelectorTimeoutException&) |