diff options
Diffstat (limited to 'cppu/source/threadpool/threadpool.cxx')
| -rw-r--r-- | cppu/source/threadpool/threadpool.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cppu/source/threadpool/threadpool.cxx b/cppu/source/threadpool/threadpool.cxx index 512ddb095cd2..a74d8678d986 100644 --- a/cppu/source/threadpool/threadpool.cxx +++ b/cppu/source/threadpool/threadpool.cxx @@ -22,6 +22,7 @@ #include <cassert> #include <chrono> #include <algorithm> +#include <utility> #include <unordered_map> #include <osl/diagnose.h> @@ -32,14 +33,13 @@ #include "threadpool.hxx" #include "thread.hxx" -using namespace ::std; using namespace ::osl; using namespace ::rtl; namespace cppu_threadpool { WaitingThread::WaitingThread( - rtl::Reference<ORequestThread> const & theThread): thread(theThread) + rtl::Reference<ORequestThread> theThread): thread(std::move(theThread)) {} DisposedCallerAdminHolder const & DisposedCallerAdmin::getInstance() @@ -62,7 +62,7 @@ namespace cppu_threadpool void DisposedCallerAdmin::destroy( void const * nDisposeId ) { std::scoped_lock guard( m_mutex ); - m_vector.erase(std::remove(m_vector.begin(), m_vector.end(), nDisposeId), m_vector.end()); + std::erase(m_vector, nDisposeId); } bool DisposedCallerAdmin::isDisposed( void const * nDisposeId ) @@ -236,7 +236,7 @@ namespace cppu_threadpool if( ii == m_mapQueue.end() ) { - m_mapQueue[ aThreadId ] = pair < JobQueue * , JobQueue * > ( nullptr , nullptr ); + m_mapQueue[ aThreadId ] = std::pair < JobQueue * , JobQueue * > ( nullptr , nullptr ); ii = m_mapQueue.find( aThreadId ); OSL_ASSERT( ii != m_mapQueue.end() ); } @@ -279,7 +279,7 @@ namespace cppu_threadpool if( ii == m_mapQueue.end() ) { JobQueue *p = new JobQueue(); - m_mapQueue[ aThreadId ] = pair< JobQueue * , JobQueue * > ( p , nullptr ); + m_mapQueue[ aThreadId ] = std::pair< JobQueue * , JobQueue * > ( p , nullptr ); } else if( nullptr == (*ii).second.first ) { |