diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/ThreadPool.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/Ice/ThreadPool.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp index 5cc696ff9e4..c27f3f9864a 100644 --- a/cpp/src/Ice/ThreadPool.cpp +++ b/cpp/src/Ice/ThreadPool.cpp @@ -405,7 +405,7 @@ IceInternal::ThreadPool::run() if (!_handlerMap.empty()) { _maxFd = max(_maxFd, (--_handlerMap.end())->first); - _minFd = min(_minFd, (_handlerMap.begin())->first); + _minFd = min(_minFd, _handlerMap.begin()->first); } if (_handlerMap.empty() || _servers == 0) { diff --git a/cpp/src/Ice/ThreadPool.h b/cpp/src/Ice/ThreadPool.h index a5fd8c1e47b..939cbaf6104 100644 --- a/cpp/src/Ice/ThreadPool.h +++ b/cpp/src/Ice/ThreadPool.h @@ -17,6 +17,10 @@ #include <Ice/EventHandlerF.h> #include <list> +#ifndef WIN32 +# define SOCKET int +#endif + namespace IceInternal { |