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 /cppu | |
| 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 'cppu')
| -rw-r--r-- | cppu/source/threadpool/jobqueue.hxx | 5 | ||||
| -rw-r--r-- | cppu/source/threadpool/thread.cxx | 1 | ||||
| -rw-r--r-- | cppu/source/threadpool/threadpool.cxx | 1 | ||||
| -rw-r--r-- | cppu/source/threadpool/threadpool.hxx | 4 |
4 files changed, 5 insertions, 6 deletions
diff --git a/cppu/source/threadpool/jobqueue.hxx b/cppu/source/threadpool/jobqueue.hxx index 3a55d6b2a82c..6d357986e254 100644 --- a/cppu/source/threadpool/jobqueue.hxx +++ b/cppu/source/threadpool/jobqueue.hxx @@ -21,13 +21,12 @@ #define INCLUDED_CPPU_SOURCE_THREADPOOL_JOBQUEUE_HXX #include <list> +#include <memory> #include <sal/types.h> #include <osl/conditn.hxx> #include <osl/mutex.hxx> -#include <boost/shared_ptr.hpp> - namespace cppu_threadpool { extern "C" typedef void (SAL_CALL RequestFun)(void *); @@ -43,7 +42,7 @@ namespace cppu_threadpool typedef ::std::list < sal_Int64 > CallStackList; class DisposedCallerAdmin; - typedef boost::shared_ptr<DisposedCallerAdmin> DisposedCallerAdminHolder; + typedef std::shared_ptr<DisposedCallerAdmin> DisposedCallerAdminHolder; class JobQueue { diff --git a/cppu/source/threadpool/thread.cxx b/cppu/source/threadpool/thread.cxx index d1d448f42906..ead78c3080f1 100644 --- a/cppu/source/threadpool/thread.cxx +++ b/cppu/source/threadpool/thread.cxx @@ -19,6 +19,7 @@ #include <sal/config.h> +#include <algorithm> #include <cstdlib> #include <osl/diagnose.h> #include <uno/threadpool.h> diff --git a/cppu/source/threadpool/threadpool.cxx b/cppu/source/threadpool/threadpool.cxx index 6e7a2c06363a..9868d0cd64b5 100644 --- a/cppu/source/threadpool/threadpool.cxx +++ b/cppu/source/threadpool/threadpool.cxx @@ -20,6 +20,7 @@ #include "sal/config.h" #include <cassert> +#include <algorithm> #include <unordered_map> #include <osl/diagnose.h> diff --git a/cppu/source/threadpool/threadpool.hxx b/cppu/source/threadpool/threadpool.hxx index b13dc0f31d2b..d1605d849911 100644 --- a/cppu/source/threadpool/threadpool.hxx +++ b/cppu/source/threadpool/threadpool.hxx @@ -29,8 +29,6 @@ #include <rtl/ref.hxx> #include <salhelper/simplereferenceobject.hxx> -#include <boost/shared_ptr.hpp> - #include "jobqueue.hxx" @@ -80,7 +78,7 @@ namespace cppu_threadpool { typedef ::std::list < struct ::cppu_threadpool::WaitingThread * > WaitingThreadList; class DisposedCallerAdmin; - typedef boost::shared_ptr<DisposedCallerAdmin> DisposedCallerAdminHolder; + typedef std::shared_ptr<DisposedCallerAdmin> DisposedCallerAdminHolder; class DisposedCallerAdmin { |