diff options
| author | Bernard Normier <bernard@zeroc.com> | 2007-12-21 15:25:37 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2007-12-21 15:25:37 -0500 |
| commit | e099cd4fd77c718f9c241ad609f5aa7a80627ba8 (patch) | |
| tree | 998305e426f74429b00122dcdc4f839e2f97ade5 /cpp/src/Ice/ThreadPool.cpp | |
| parent | IceUtil cleanup (first commit) (diff) | |
| parent | Fix bug 2520: Test suite unsets ICE_CONFIG to avoid configuration conflicts (diff) | |
| download | ice-e099cd4fd77c718f9c241ad609f5aa7a80627ba8.tar.bz2 ice-e099cd4fd77c718f9c241ad609f5aa7a80627ba8.tar.xz ice-e099cd4fd77c718f9c241ad609f5aa7a80627ba8.zip | |
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Conflicts:
cpp/src/Slice/VbUtil.cpp
Diffstat (limited to 'cpp/src/Ice/ThreadPool.cpp')
| -rw-r--r-- | cpp/src/Ice/ThreadPool.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp index f18134ca2a5..61b01e42c48 100644 --- a/cpp/src/Ice/ThreadPool.cpp +++ b/cpp/src/Ice/ThreadPool.cpp @@ -126,7 +126,6 @@ IceInternal::ThreadPool::destroy() IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); assert(!_destroyed); assert(_handlerMap.empty()); - assert(_workItems.empty()); _destroyed = true; _selector.setInterrupt(); } |