diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 15:41:33 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 17:01:14 +0100 |
commit | 6f495a195b794257e8b1302d384148be43c04cee (patch) | |
tree | c0ef4b8eeed1b1bb2e8da0deffac0a74b2eb5467 /sd/source/ui/tools/TimerBasedTaskExecution.cxx | |
parent | 74efa4f0e87e2b5fe7a577fa4673cb947c947c74 (diff) |
boost->std
Change-Id: I1e6a7fd66f90e6acd803c6cd464f1d73252f7bcb
Diffstat (limited to 'sd/source/ui/tools/TimerBasedTaskExecution.cxx')
-rw-r--r-- | sd/source/ui/tools/TimerBasedTaskExecution.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sd/source/ui/tools/TimerBasedTaskExecution.cxx b/sd/source/ui/tools/TimerBasedTaskExecution.cxx index a6b1299834ce..039606ea62a1 100644 --- a/sd/source/ui/tools/TimerBasedTaskExecution.cxx +++ b/sd/source/ui/tools/TimerBasedTaskExecution.cxx @@ -21,8 +21,8 @@ #include "tools/AsynchronousTask.hxx" #include <tools/time.hxx> #include <osl/diagnose.h> -#include <boost/weak_ptr.hpp> #include "sal/log.hxx" +#include <memory> namespace sd { namespace tools { @@ -37,12 +37,12 @@ public: } }; -::boost::shared_ptr<TimerBasedTaskExecution> TimerBasedTaskExecution::Create ( - const ::boost::shared_ptr<AsynchronousTask>& rpTask, +std::shared_ptr<TimerBasedTaskExecution> TimerBasedTaskExecution::Create ( + const std::shared_ptr<AsynchronousTask>& rpTask, sal_uInt32 nMillisecondsBetweenSteps, sal_uInt32 nMaxTimePerStep) { - ::boost::shared_ptr<TimerBasedTaskExecution> pExecution( + std::shared_ptr<TimerBasedTaskExecution> pExecution( new TimerBasedTaskExecution(rpTask,nMillisecondsBetweenSteps,nMaxTimePerStep), Deleter()); // Let the new object have a shared_ptr to itself, so that it can @@ -60,16 +60,16 @@ void TimerBasedTaskExecution::Release() //static void TimerBasedTaskExecution::ReleaseTask ( - const ::boost::weak_ptr<TimerBasedTaskExecution>& rpExecution) + const std::weak_ptr<TimerBasedTaskExecution>& rpExecution) { if ( ! rpExecution.expired()) { try { - ::boost::shared_ptr<tools::TimerBasedTaskExecution> pExecution (rpExecution); + std::shared_ptr<tools::TimerBasedTaskExecution> pExecution (rpExecution); pExecution->Release(); } - catch (const ::boost::bad_weak_ptr&) + catch (const std::bad_weak_ptr&) { // When a bad_weak_ptr has been thrown then the object pointed // to by rpTask has been released right after we checked that it @@ -80,7 +80,7 @@ void TimerBasedTaskExecution::ReleaseTask ( } TimerBasedTaskExecution::TimerBasedTaskExecution ( - const ::boost::shared_ptr<AsynchronousTask>& rpTask, + const std::shared_ptr<AsynchronousTask>& rpTask, sal_uInt32 nMillisecondsBetweenSteps, sal_uInt32 nMaxTimePerStep) : mpTask(rpTask), @@ -100,7 +100,7 @@ TimerBasedTaskExecution::~TimerBasedTaskExecution() } void TimerBasedTaskExecution::SetSelf ( - const ::boost::shared_ptr<TimerBasedTaskExecution>& rpSelf) + const std::shared_ptr<TimerBasedTaskExecution>& rpSelf) { if (mpTask.get() != NULL) mpSelf = rpSelf; |