diff options
Diffstat (limited to 'cpp/src/Ice/ThreadPool.cpp')
| -rw-r--r-- | cpp/src/Ice/ThreadPool.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp index 8294b7c272a..d79a0900293 100644 --- a/cpp/src/Ice/ThreadPool.cpp +++ b/cpp/src/Ice/ThreadPool.cpp @@ -703,7 +703,7 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread) current._handler = ICE_GET_SHARED_FROM_THIS(_nextHandler->first); current.operation = _nextHandler->second; ++_nextHandler; - thread->setState(ThreadStateInUseForIO); + thread->setState(ICE_ENUM(ThreadState, ThreadStateInUseForIO)); } else { @@ -727,7 +727,7 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread) _handlers.clear(); _selector.startSelect(); select = true; - thread->setState(ThreadStateIdle); + thread->setState(ICE_ENUM(ThreadState, ThreadStateIdle)); } } else if(_sizeMax > 1) @@ -822,7 +822,7 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread) { IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); - thread->setState(ThreadStateInUseForIO); + thread->setState(ICE_ENUM(ThreadState, ThreadStateInUseForIO)); } try @@ -865,7 +865,7 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread) assert(_inUse > 0); --_inUse; } - thread->setState(ThreadStateIdle); + thread->setState(ICE_ENUM(ThreadState, ThreadStateIdle)); } } #endif @@ -878,7 +878,7 @@ IceInternal::ThreadPool::ioCompleted(ThreadPoolCurrent& current) current._ioCompleted = true; // Set the IO completed flag to specifiy that ioCompleted() has been called. - current._thread->setState(ThreadStateInUseForUser); + current._thread->setState(ICE_ENUM(ThreadState, ThreadStateInUseForUser)); if(_sizeMax > 1) { @@ -1078,7 +1078,7 @@ IceInternal::ThreadPool::followerWait(ThreadPoolCurrent& current) { assert(!current._leader); - current._thread->setState(ThreadStateIdle); + current._thread->setState(ICE_ENUM(ThreadState, ThreadStateIdle)); // // It's important to clear the handler before waiting to make sure that @@ -1135,7 +1135,7 @@ IceInternal::ThreadPool::nextThreadId() IceInternal::ThreadPool::EventHandlerThread::EventHandlerThread(const ThreadPoolPtr& pool, const string& name) : IceUtil::Thread(name), _pool(pool), - _state(Ice::Instrumentation::ThreadStateIdle) + _state(ICE_ENUM(ThreadState, ThreadStateIdle)) { updateObserver(); } |