diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-05-06 14:46:43 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-05-06 14:46:43 +0200 |
| commit | b5b3a899f3418a1f477db3ce4044dda38c9cef47 (patch) | |
| tree | aef7ebcf67e31e993a8d821bc8f251aac749a6f1 /cpp/src/Ice/ThreadPool.cpp | |
| parent | minor build fix (diff) | |
| download | ice-b5b3a899f3418a1f477db3ce4044dda38c9cef47.tar.bz2 ice-b5b3a899f3418a1f477db3ce4044dda38c9cef47.tar.xz ice-b5b3a899f3418a1f477db3ce4044dda38c9cef47.zip | |
Fixed WinRT build (transport re-factoring)
Diffstat (limited to 'cpp/src/Ice/ThreadPool.cpp')
| -rw-r--r-- | cpp/src/Ice/ThreadPool.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp index 61415da250a..e0c1680c745 100644 --- a/cpp/src/Ice/ThreadPool.cpp +++ b/cpp/src/Ice/ThreadPool.cpp @@ -868,8 +868,12 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread) try { current._ioCompleted = false; +#ifdef ICE_OS_WINRT + current._handler = _selector.getNextHandler(current.operation, _threadIdleTime); +#else current._handler = _selector.getNextHandler(current.operation, current._count, current._error, _threadIdleTime); +#endif } catch(const SelectorTimeoutException&) { @@ -914,8 +918,12 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread) try { +#ifdef ICE_OS_WINRT + current._handler = _selector.getNextHandler(current.operation, _serverIdleTime); +#else current._handler = _selector.getNextHandler(current.operation, current._count, current._error, _serverIdleTime); +#endif } catch(const SelectorTimeoutException&) { @@ -1086,9 +1094,11 @@ IceInternal::ThreadPool::startMessage(ThreadPoolCurrent& current) current._handler->_ready = static_cast<SocketOperation>(current._handler->_ready | current.operation); current._handler->_started = static_cast<SocketOperation>(current._handler->_started & ~current.operation); +#ifndef ICE_OS_WINRT AsyncInfo* info = current._handler->getNativeInfo()->getAsyncInfo(current.operation); info->count = current._count; info->error = current._error; +#endif if(!current._handler->finishAsync(current.operation)) // Returns false if the handler is finished. { |