From 6de3688cc6bd52ce08ff8a4327e59dbbc8a5c7d4 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 15 Feb 2017 23:55:18 +0200 Subject: Drop :: prefix from std in c*/ Change-Id: If078cda95fa6ccd37270a5e9d81cfa0b84e71155 Reviewed-on: https://gerrit.libreoffice.org/34324 Tested-by: Jenkins Reviewed-by: Tor Lillqvist --- cppu/source/threadpool/jobqueue.hxx | 2 +- cppu/source/threadpool/thread.cxx | 2 +- cppu/source/threadpool/threadpool.hxx | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'cppu') diff --git a/cppu/source/threadpool/jobqueue.hxx b/cppu/source/threadpool/jobqueue.hxx index 9b73052e9470..d4a26c7709cc 100644 --- a/cppu/source/threadpool/jobqueue.hxx +++ b/cppu/source/threadpool/jobqueue.hxx @@ -38,7 +38,7 @@ namespace cppu_threadpool RequestFun * doRequest; }; - typedef ::std::list < struct Job > JobList; + typedef std::list < struct Job > JobList; class DisposedCallerAdmin; typedef std::shared_ptr DisposedCallerAdminHolder; diff --git a/cppu/source/threadpool/thread.cxx b/cppu/source/threadpool/thread.cxx index 0e8b809c3a8c..8dfa93bd443f 100644 --- a/cppu/source/threadpool/thread.cxx +++ b/cppu/source/threadpool/thread.cxx @@ -55,7 +55,7 @@ namespace cppu_threadpool { void ThreadAdmin::remove_locked( rtl::Reference< ORequestThread > const & p ) { - ::std::list< rtl::Reference< ORequestThread > >::iterator ii = ::std::find( m_lst.begin(), m_lst.end(), p ); + std::list< rtl::Reference< ORequestThread > >::iterator ii = std::find( m_lst.begin(), m_lst.end(), p ); if( ii != m_lst.end() ) { m_lst.erase( ii ); diff --git a/cppu/source/threadpool/threadpool.hxx b/cppu/source/threadpool/threadpool.hxx index d5cb8df7be3c..037f14a5d581 100644 --- a/cppu/source/threadpool/threadpool.hxx +++ b/cppu/source/threadpool/threadpool.hxx @@ -58,7 +58,7 @@ namespace cppu_threadpool { typedef std::unordered_map < ::rtl::ByteSequence, // ThreadID - ::std::pair < JobQueue * , JobQueue * >, + std::pair < JobQueue * , JobQueue * >, HashThreadId, EqualThreadId > ThreadIdHashMap; @@ -72,7 +72,7 @@ namespace cppu_threadpool { rtl::Reference const & theThread); }; - typedef ::std::list < struct ::cppu_threadpool::WaitingThread * > WaitingThreadList; + typedef std::list < struct ::cppu_threadpool::WaitingThread * > WaitingThreadList; class DisposedCallerAdmin; typedef std::shared_ptr DisposedCallerAdminHolder; @@ -90,7 +90,7 @@ namespace cppu_threadpool { private: ::osl::Mutex m_mutex; - ::std::vector< sal_Int64 > m_lst; + std::vector< sal_Int64 > m_lst; }; class ThreadAdmin @@ -107,7 +107,7 @@ namespace cppu_threadpool { ::osl::Mutex m_mutex; private: - ::std::list< rtl::Reference< ORequestThread > > m_lst; + std::list< rtl::Reference< ORequestThread > > m_lst; bool m_disposed; }; -- cgit