diff options
| author | Jose <jose@zeroc.com> | 2013-01-31 16:51:40 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2013-01-31 16:51:40 +0100 |
| commit | 4d55f11cdf22fbc23e3e7c9f4758566bd05a9471 (patch) | |
| tree | f5c3071ebb27c18dae2fb2585706bd9af8dd92cf /cpp/src/Ice/ThreadPool.cpp | |
| parent | Fixed ICE-4870 - optional comparison operators on C++ structs (diff) | |
| download | ice-4d55f11cdf22fbc23e3e7c9f4758566bd05a9471.tar.bz2 ice-4d55f11cdf22fbc23e3e7c9f4758566bd05a9471.tar.xz ice-4d55f11cdf22fbc23e3e7c9f4758566bd05a9471.zip | |
Xcode 4.6 - clang 4.2 updates
Diffstat (limited to 'cpp/src/Ice/ThreadPool.cpp')
| -rw-r--r-- | cpp/src/Ice/ThreadPool.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp index 055174f3f84..56baebe8541 100644 --- a/cpp/src/Ice/ThreadPool.cpp +++ b/cpp/src/Ice/ThreadPool.cpp @@ -156,10 +156,8 @@ IceInternal::DispatchWorkItem::execute(ThreadPoolCurrent& current) } } -IceInternal::ThreadPoolWorkQueue::ThreadPoolWorkQueue(ThreadPool* threadPool, - const InstancePtr& instance, +IceInternal::ThreadPoolWorkQueue::ThreadPoolWorkQueue(const InstancePtr& instance, Selector& selector) : - _threadPool(threadPool), _instance(instance), _selector(selector), _destroyed(false) @@ -480,7 +478,7 @@ IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& p const_cast<int&>(_priority) = properties->getPropertyAsInt("Ice.ThreadPriority"); } - _workQueue = new ThreadPoolWorkQueue(this, _instance, _selector); + _workQueue = new ThreadPoolWorkQueue(_instance, _selector); if(_instance->traceLevels()->threadPool >= 1) { |