From fd1372ba8b1c3eb3c7fad6d9c623176c8071f31b Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 1 Jan 2015 19:58:59 +0000 Subject: boost::unordered_map->std::unordered_map you can get debug stl this way Change-Id: Ia70a3e7c7c452390e8bee34975d296c9318e4a19 --- toolkit/source/controls/dialogcontrol.cxx | 8 ++++---- toolkit/source/controls/geometrycontrolmodel.cxx | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'toolkit') diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index eae95dab7ed7..5d84922ac517 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -42,11 +42,11 @@ #include #include #include -#include -#include #include #include #include +#include +#include #include "osl/file.hxx" #include @@ -77,8 +77,8 @@ typedef ::cppu::WeakImplHelper1< container::XNameContainer > SimpleNameContainer template< typename T > class SimpleNamedThingContainer : public SimpleNameContainer_BASE { - typedef boost::unordered_map< OUString, Reference< T >, OUStringHash, - ::std::equal_to< OUString > > NamedThingsHash; + typedef std::unordered_map< OUString, Reference< T >, OUStringHash, + std::equal_to< OUString > > NamedThingsHash; NamedThingsHash things; ::osl::Mutex m_aMutex; public: diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx index 43d410faa9a0..64faae381c91 100644 --- a/toolkit/source/controls/geometrycontrolmodel.cxx +++ b/toolkit/source/controls/geometrycontrolmodel.cxx @@ -440,9 +440,9 @@ - typedef ::boost::unordered_map< OUString, sal_Int32, OUStringHash > HashMapString2Int; - typedef ::std::vector< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > > PropSeqArray; - typedef ::std::vector< ::std::vector< sal_Int32 > > IntArrayArray; + typedef std::unordered_map< OUString, sal_Int32, OUStringHash > HashMapString2Int; + typedef std::vector< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > > PropSeqArray; + typedef std::vector< ::std::vector< sal_Int32 > > IntArrayArray; // for creating class-unique PropertySetInfo's, we need some info: namespace { struct ServiceSpecifierMap : public rtl::Static< HashMapString2Int, ServiceSpecifierMap > {}; } -- cgit