diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 18:59:32 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 18:59:32 +0100 |
commit | d030c4a2a54418b17e87f837092a33eae21f0588 (patch) | |
tree | dd80ff3ba78eaa03e98efeb87e9160c6cd7524c5 /sd/source/ui/tools/TimerBasedTaskExecution.cxx | |
parent | silence warning when not a warning (diff) | |
download | core-d030c4a2a54418b17e87f837092a33eae21f0588.tar.gz core-d030c4a2a54418b17e87f837092a33eae21f0588.zip |
revert for mac and win unit case crashes after boost->std
Change-Id: I82c7084f203a834c2d42f9527705288e6036019b
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 039606ea62a1..a6b1299834ce 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: } }; -std::shared_ptr<TimerBasedTaskExecution> TimerBasedTaskExecution::Create ( - const std::shared_ptr<AsynchronousTask>& rpTask, +::boost::shared_ptr<TimerBasedTaskExecution> TimerBasedTaskExecution::Create ( + const ::boost::shared_ptr<AsynchronousTask>& rpTask, sal_uInt32 nMillisecondsBetweenSteps, sal_uInt32 nMaxTimePerStep) { - std::shared_ptr<TimerBasedTaskExecution> pExecution( + ::boost::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 std::weak_ptr<TimerBasedTaskExecution>& rpExecution) + const ::boost::weak_ptr<TimerBasedTaskExecution>& rpExecution) { if ( ! rpExecution.expired()) { try { - std::shared_ptr<tools::TimerBasedTaskExecution> pExecution (rpExecution); + ::boost::shared_ptr<tools::TimerBasedTaskExecution> pExecution (rpExecution); pExecution->Release(); } - catch (const std::bad_weak_ptr&) + catch (const ::boost::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 std::shared_ptr<AsynchronousTask>& rpTask, + const ::boost::shared_ptr<AsynchronousTask>& rpTask, sal_uInt32 nMillisecondsBetweenSteps, sal_uInt32 nMaxTimePerStep) : mpTask(rpTask), @@ -100,7 +100,7 @@ TimerBasedTaskExecution::~TimerBasedTaskExecution() } void TimerBasedTaskExecution::SetSelf ( - const std::shared_ptr<TimerBasedTaskExecution>& rpSelf) + const ::boost::shared_ptr<TimerBasedTaskExecution>& rpSelf) { if (mpTask.get() != NULL) mpSelf = rpSelf; |