From f651ea26eaa6b2a5b3dd1892397fbb1fac157d1d Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 31 Aug 2016 16:25:52 +0200 Subject: std::list -> std::deque Change-Id: Ib34d6bf97fc97ea1c30c184a7de4ace7f533065f --- cppu/source/threadpool/jobqueue.cxx | 2 +- cppu/source/threadpool/jobqueue.hxx | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'cppu') diff --git a/cppu/source/threadpool/jobqueue.cxx b/cppu/source/threadpool/jobqueue.cxx index 447b0a20a532..2d375dcf8bbd 100644 --- a/cppu/source/threadpool/jobqueue.cxx +++ b/cppu/source/threadpool/jobqueue.cxx @@ -129,7 +129,7 @@ namespace cppu_threadpool { void JobQueue::dispose( sal_Int64 nDisposeId ) { MutexGuard guard( m_mutex ); - for( CallStackList::iterator ii = m_lstCallstack.begin() ; + for( auto ii = m_lstCallstack.begin() ; ii != m_lstCallstack.end() ; ++ii ) { diff --git a/cppu/source/threadpool/jobqueue.hxx b/cppu/source/threadpool/jobqueue.hxx index 6d357986e254..9b73052e9470 100644 --- a/cppu/source/threadpool/jobqueue.hxx +++ b/cppu/source/threadpool/jobqueue.hxx @@ -21,6 +21,7 @@ #define INCLUDED_CPPU_SOURCE_THREADPOOL_JOBQUEUE_HXX #include +#include #include #include @@ -39,8 +40,6 @@ namespace cppu_threadpool typedef ::std::list < struct Job > JobList; - typedef ::std::list < sal_Int64 > CallStackList; - class DisposedCallerAdmin; typedef std::shared_ptr DisposedCallerAdminHolder; @@ -64,7 +63,7 @@ namespace cppu_threadpool private: mutable ::osl::Mutex m_mutex; JobList m_lstJob; - CallStackList m_lstCallstack; + std::deque m_lstCallstack; sal_Int32 m_nToDo; bool m_bSuspended; osl::Condition m_cndWait; -- cgit