diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/inc/HashMaps.hxx | 21 | ||||
| -rw-r--r-- | package/source/manifest/ManifestImport.hxx | 2 | ||||
| -rw-r--r-- | package/source/xstor/ohierarchyholder.hxx | 12 |
3 files changed, 5 insertions, 30 deletions
diff --git a/package/inc/HashMaps.hxx b/package/inc/HashMaps.hxx index e83a9483524f..f10760f62517 100644 --- a/package/inc/HashMaps.hxx +++ b/package/inc/HashMaps.hxx @@ -25,32 +25,17 @@ #include <memory> -struct eqFunc -{ - bool operator()( const OUString &r1, - const OUString &r2) const - { - return r1 == r2; - } -}; - class ZipPackageFolder; struct ZipContentInfo; typedef std::unordered_map < OUString, - ZipPackageFolder *, - OUStringHash, - eqFunc > FolderHash; + ZipPackageFolder * > FolderHash; typedef std::unordered_map < OUString, - std::unique_ptr<ZipContentInfo>, - OUStringHash, - eqFunc > ContentHash; + std::unique_ptr<ZipContentInfo> > ContentHash; typedef std::unordered_map < OUString, - ZipEntry, - OUStringHash, - eqFunc > EntryHash; + ZipEntry > EntryHash; #endif diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx index 094e7d70d103..9eac12e61a43 100644 --- a/package/source/manifest/ManifestImport.hxx +++ b/package/source/manifest/ManifestImport.hxx @@ -31,7 +31,7 @@ namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } -typedef std::unordered_map< OUString, OUString, OUStringHash, eqFunc > StringHashMap; +typedef std::unordered_map< OUString, OUString > StringHashMap; struct ManifestScopeEntry { diff --git a/package/source/xstor/ohierarchyholder.hxx b/package/source/xstor/ohierarchyholder.hxx index 219391311ae8..3d18c8d407da 100644 --- a/package/source/xstor/ohierarchyholder.hxx +++ b/package/source/xstor/ohierarchyholder.hxx @@ -35,18 +35,8 @@ struct OHierarchyElement_Impl; -struct eqFunc -{ - bool operator()( const OUString &r1, - const OUString &r2) const - { - return r1 == r2; - } -}; typedef std::unordered_map< OUString, - ::rtl::Reference< OHierarchyElement_Impl >, - OUStringHash, - eqFunc > OHierarchyElementList_Impl; + ::rtl::Reference< OHierarchyElement_Impl > > OHierarchyElementList_Impl; typedef ::std::vector< OUString > OStringList_Impl; typedef ::std::list< css::uno::WeakReference< css::embed::XExtendedStorageStream > > |