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 --- package/inc/HashMaps.hxx | 8 ++++---- package/source/manifest/ManifestImport.hxx | 2 +- package/source/xstor/ohierarchyholder.hxx | 4 ++-- package/source/zippackage/ZipPackageFolderEnumeration.hxx | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'package') diff --git a/package/inc/HashMaps.hxx b/package/inc/HashMaps.hxx index 55b1c183ecd9..a8855090fc47 100644 --- a/package/inc/HashMaps.hxx +++ b/package/inc/HashMaps.hxx @@ -21,7 +21,7 @@ #include #include -#include +#include struct eqFunc { @@ -37,17 +37,17 @@ namespace com { namespace sun { namespace star { namespace packages { class ContentInfo; } } } } -typedef boost::unordered_map < OUString, +typedef std::unordered_map < OUString, ZipPackageFolder *, OUStringHash, eqFunc > FolderHash; -typedef boost::unordered_map < OUString, +typedef std::unordered_map < OUString, rtl::Reference < com::sun::star::packages::ContentInfo >, OUStringHash, eqFunc > ContentHash; -typedef boost::unordered_map < OUString, +typedef std::unordered_map < OUString, ZipEntry, OUStringHash, eqFunc > EntryHash; diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx index 4f2815d9bc34..965a33b3953a 100644 --- a/package/source/manifest/ManifestImport.hxx +++ b/package/source/manifest/ManifestImport.hxx @@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } -typedef ::boost::unordered_map< OUString, OUString, OUStringHash, eqFunc > StringHashMap; +typedef std::unordered_map< OUString, OUString, OUStringHash, eqFunc > StringHashMap; struct ManifestScopeEntry { diff --git a/package/source/xstor/ohierarchyholder.hxx b/package/source/xstor/ohierarchyholder.hxx index 75aa3477c7b9..d680b434dd6a 100644 --- a/package/source/xstor/ohierarchyholder.hxx +++ b/package/source/xstor/ohierarchyholder.hxx @@ -29,8 +29,8 @@ #include -#include #include +#include #include struct OHierarchyElement_Impl; @@ -43,7 +43,7 @@ struct eqFunc return r1 == r2; } }; -typedef ::boost::unordered_map< OUString, +typedef std::unordered_map< OUString, ::rtl::Reference< OHierarchyElement_Impl >, OUStringHash, eqFunc > OHierarchyElementList_Impl; diff --git a/package/source/zippackage/ZipPackageFolderEnumeration.hxx b/package/source/zippackage/ZipPackageFolderEnumeration.hxx index 4be55b29abd3..569714665509 100644 --- a/package/source/zippackage/ZipPackageFolderEnumeration.hxx +++ b/package/source/zippackage/ZipPackageFolderEnumeration.hxx @@ -34,7 +34,7 @@ protected: ContentHash& rContents; ContentHash::const_iterator aIterator; public: - //ZipPackageFolderEnumeration (boost::unordered_map < OUString, com::sun::star::uno::Reference < com::sun::star::container::XNamed >, hashFunc, eqFunc > &rInput); + //ZipPackageFolderEnumeration (unordered_map < OUString, com::sun::star::uno::Reference < com::sun::star::container::XNamed >, hashFunc, eqFunc > &rInput); ZipPackageFolderEnumeration (ContentHash &rInput); virtual ~ZipPackageFolderEnumeration( void ); -- cgit