From 87a9979c8938b800aab6e35903d60d24892e7f2e Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 19 Oct 2017 17:18:17 +0200 Subject: overload std::hash for OUString and OString no need to explicitly specify it anymore Change-Id: I6ad9259cce77201fdd75152533f5151aae83e9ec Reviewed-on: https://gerrit.libreoffice.org/43567 Tested-by: Jenkins Reviewed-by: Noel Grandin --- package/source/manifest/ManifestImport.hxx | 2 +- package/source/xstor/ohierarchyholder.hxx | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) (limited to 'package/source') 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 > > -- cgit