summaryrefslogtreecommitdiffstats
path: root/slideshow/source/engine/eventmultiplexer.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'slideshow/source/engine/eventmultiplexer.cxx')
-rw-r--r--slideshow/source/engine/eventmultiplexer.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx
index 1001d76a8230..b71e71c71e16 100644
--- a/slideshow/source/engine/eventmultiplexer.cxx
+++ b/slideshow/source/engine/eventmultiplexer.cxx
@@ -42,22 +42,22 @@
#include "unoview.hxx"
#include "unoviewcontainer.hxx"
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
#include <boost/mem_fn.hpp>
+#include <memory>
#include <algorithm>
#include <vector>
using namespace ::com::sun::star;
-namespace boost
+
+namespace std
{
- // add operator== for weak_ptr
+ // add operator== for weak_ptr, so we can use std::find over lists of them
template<typename T> bool operator==( weak_ptr<T> const& rLHS,
weak_ptr<T> const& rRHS )
{
- return !(rLHS<rRHS) && !(rRHS<rLHS);
+ return rLHS.lock().get() == rRHS.lock().get();
}
}
@@ -67,7 +67,7 @@ namespace internal {
template <typename HandlerT>
class PrioritizedHandlerEntry
{
- typedef boost::shared_ptr<HandlerT> HandlerSharedPtrT;
+ typedef std::shared_ptr<HandlerT> HandlerSharedPtrT;
HandlerSharedPtrT mpHandler;
double mnPrio;
@@ -297,7 +297,7 @@ struct EventMultiplexerImpl
setAutomaticMode(true) call is then able to
regenerate the event.
*/
- ::boost::weak_ptr< Event > mpTickEvent;
+ ::std::weak_ptr< Event > mpTickEvent;
bool mbIsAutoMode;
};