diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-14 09:21:33 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-14 12:54:25 +0000 |
| commit | 22b80ac8e213ff63ce4f60e7d491f12cb42db313 (patch) | |
| tree | b00f1ed362747a05d79686a8709c3408cfdee59b /comphelper | |
| parent | d8026ad65c8d50868f0f2fc0d2bd95820cddea83 (diff) | |
boost->std
Change-Id: I3fd9e1599c5ad812879a58cf1dabbcd393105e1c
Reviewed-on: https://gerrit.libreoffice.org/18564
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/inc/pch/precompiled_comphelper.hxx | 1 | ||||
| -rw-r--r-- | comphelper/source/misc/threadpool.cxx | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/comphelper/inc/pch/precompiled_comphelper.hxx b/comphelper/inc/pch/precompiled_comphelper.hxx index 35bdc06a823f..cfc80557196e 100644 --- a/comphelper/inc/pch/precompiled_comphelper.hxx +++ b/comphelper/inc/pch/precompiled_comphelper.hxx @@ -20,7 +20,6 @@ #include <boost/current_function.hpp> #include <boost/noncopyable.hpp> #include <memory> -#include <boost/shared_ptr.hpp> #include <cassert> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> diff --git a/comphelper/source/misc/threadpool.cxx b/comphelper/source/misc/threadpool.cxx index a916ba90f7bd..965a93c22e41 100644 --- a/comphelper/source/misc/threadpool.cxx +++ b/comphelper/source/misc/threadpool.cxx @@ -10,9 +10,9 @@ #include <comphelper/threadpool.hxx> #include <rtl/instance.hxx> -#include <boost/shared_ptr.hpp> -#include <thread> #include <algorithm> +#include <memory> +#include <thread> namespace comphelper { @@ -111,12 +111,12 @@ ThreadPool::~ThreadPool() waitAndCleanupWorkers(); } -struct ThreadPoolStatic : public rtl::StaticWithInit< boost::shared_ptr< ThreadPool >, +struct ThreadPoolStatic : public rtl::StaticWithInit< std::shared_ptr< ThreadPool >, ThreadPoolStatic > { - boost::shared_ptr< ThreadPool > operator () () { + std::shared_ptr< ThreadPool > operator () () { sal_Int32 nThreads = std::max( std::thread::hardware_concurrency(), 1U ); - return boost::shared_ptr< ThreadPool >( new ThreadPool( nThreads ) ); + return std::shared_ptr< ThreadPool >( new ThreadPool( nThreads ) ); }; }; |