diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2009-11-02 22:14:11 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2009-11-02 22:14:11 +0100 |
| commit | 00f352227f1ddc3b01d747410588ed61a2327f59 (patch) | |
| tree | d22a0d6c9c941f9040b6c5966a1cdc16e963bdbd /cpp/src | |
| parent | - icegridadmin when using username/password authentication now zeros (diff) | |
| download | ice-00f352227f1ddc3b01d747410588ed61a2327f59.tar.bz2 ice-00f352227f1ddc3b01d747410588ed61a2327f59.tar.xz ice-00f352227f1ddc3b01d747410588ed61a2327f59.zip | |
Fixed bug 4346 - gcc 4.3.4 warnings
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/ThreadPool.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp index 3834d0898dc..ec61063885b 100644 --- a/cpp/src/Ice/ThreadPool.cpp +++ b/cpp/src/Ice/ThreadPool.cpp @@ -995,13 +995,14 @@ IceInternal::ThreadPool::followerWait(const IceUtil::ThreadPtr& thread, ThreadPo // // Wait to be promoted and for all the IO threads to be done. // - while(!_promote || _inUseIO == _sizeIO || _nextHandler == _handlers.end() && _inUseIO > 0) + while(!_promote || _inUseIO == _sizeIO || (_nextHandler == _handlers.end() && _inUseIO > 0)) { if(_threadIdleTime) { if(!timedWait(IceUtil::Time::seconds(_threadIdleTime))) { - if(!_destroyed && (!_promote || _inUseIO == _sizeIO || _nextHandler == _handlers.end() && _inUseIO > 0)) + if(!_destroyed && (!_promote || _inUseIO == _sizeIO || + (_nextHandler == _handlers.end() && _inUseIO > 0))) { if(_instance->traceLevels()->threadPool >= 1) { |