summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-01-03 21:24:08 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-01-04 11:07:58 +0000
commit0be5d2b2f6366b295a47a3b9d4e87091b6fd446b (patch)
tree093a35526d927b073640783b41ef23f44a6af221 /slideshow
parent799e07f02dbca97f4dd9cff5b779392b13b9021c (diff)
boost::unordered_map->std::unordered_map
Change-Id: I82f668ef72e916d2ff11df5cda2a02653999f66f
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/inc/pch/precompiled_slideshow.hxx2
-rw-r--r--slideshow/source/engine/eventmultiplexer.cxx3
-rw-r--r--slideshow/source/engine/slide/layermanager.hxx8
-rw-r--r--slideshow/source/engine/slide/targetpropertiescreator.cxx6
4 files changed, 9 insertions, 10 deletions
diff --git a/slideshow/inc/pch/precompiled_slideshow.hxx b/slideshow/inc/pch/precompiled_slideshow.hxx
index e091600b2109..ffdc8bb46fb7 100644
--- a/slideshow/inc/pch/precompiled_slideshow.hxx
+++ b/slideshow/inc/pch/precompiled_slideshow.hxx
@@ -49,7 +49,6 @@
#include <boost/shared_ptr.hpp>
#include <boost/spirit/include/classic_core.hpp>
#include <boost/tuple/tuple.hpp>
-#include <boost/unordered_map.hpp>
#include <boost/weak_ptr.hpp>
#include <canvas/canvastools.hxx>
#include <canvas/debug.hxx>
@@ -208,6 +207,7 @@
#include <tools/helpers.hxx>
#include <tools/stream.hxx>
#include <tools/urlobj.hxx>
+#include <unordered_map>
#include <unotools/streamwrap.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <vcl/animate.hxx>
diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx
index 3049a5a59c22..98d06d1d65b3 100644
--- a/slideshow/source/engine/eventmultiplexer.cxx
+++ b/slideshow/source/engine/eventmultiplexer.cxx
@@ -50,9 +50,8 @@
#include <boost/noncopyable.hpp>
#include <boost/bind.hpp>
-#include <vector>
-#include <boost/unordered_map.hpp>
#include <algorithm>
+#include <vector>
using namespace ::com::sun::star;
diff --git a/slideshow/source/engine/slide/layermanager.hxx b/slideshow/source/engine/slide/layermanager.hxx
index 12a1427daf50..76a369e26ea9 100644
--- a/slideshow/source/engine/slide/layermanager.hxx
+++ b/slideshow/source/engine/slide/layermanager.hxx
@@ -31,11 +31,11 @@
#include "layer.hxx"
#include "tools.hxx"
-#include <vector>
-#include <map>
-#include <boost/unordered_map.hpp>
#include <algorithm>
#include <functional>
+#include <map>
+#include <unordered_map>
+#include <vector>
namespace basegfx {
class B2DRange;
@@ -230,7 +230,7 @@ namespace slideshow
Provides quicker lookup than ShapeSet for simple mappings
*/
- typedef ::boost::unordered_map<
+ typedef std::unordered_map<
::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape >,
ShapeSharedPtr,
diff --git a/slideshow/source/engine/slide/targetpropertiescreator.cxx b/slideshow/source/engine/slide/targetpropertiescreator.cxx
index 52541bc07ebb..deef54f6720c 100644
--- a/slideshow/source/engine/slide/targetpropertiescreator.cxx
+++ b/slideshow/source/engine/slide/targetpropertiescreator.cxx
@@ -26,7 +26,7 @@
#include <com/sun/star/animations/AnimationNodeType.hpp>
#include <com/sun/star/animations/XAnimate.hpp>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <vector>
#include "targetpropertiescreator.hxx"
@@ -59,7 +59,7 @@ namespace internal
*/
sal_Int16 mnParagraphIndex;
- /// Comparison needed for boost::unordered_map
+ /// Comparison needed for unordered_map
bool operator==( const ShapeHashKey& rRHS ) const
{
return mxRef == rRHS.mxRef && mnParagraphIndex == rRHS.mnParagraphIndex;
@@ -89,7 +89,7 @@ namespace internal
};
// A hash map which maps a XShape to the corresponding vector of initial properties
- typedef ::boost::unordered_map< ShapeHashKey, VectorOfNamedValues, ShapeKeyHasher > XShapeHash;
+ typedef std::unordered_map< ShapeHashKey, VectorOfNamedValues, ShapeKeyHasher > XShapeHash;
class NodeFunctor