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 --- cppu/source/uno/lbenv.cxx | 5 ++--- cppu/source/uno/lbmap.cxx | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'cppu/source/uno') diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index 94bb57271f87..fe02245527cf 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -46,7 +46,6 @@ using ::rtl::OUString; -using ::rtl::OUStringHash; namespace { @@ -102,14 +101,14 @@ struct FctPtrHash // mapping from environment name to environment typedef std::unordered_map< - OUString, uno_Environment *, OUStringHash > OUString2EnvironmentMap; + OUString, uno_Environment * > OUString2EnvironmentMap; // mapping from ptr to object entry typedef std::unordered_map< void *, ObjectEntry *, FctPtrHash > Ptr2ObjectMap; // mapping from oid to object entry typedef std::unordered_map< - OUString, ObjectEntry *, OUStringHash > OId2ObjectMap; + OUString, ObjectEntry * > OId2ObjectMap; struct EnvironmentsData { diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index c1b52f4f27a3..ecd89ecdc328 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -50,7 +50,6 @@ using namespace osl; using namespace com::sun::star::uno; using ::rtl::OUString; using ::rtl::OUStringBuffer; -using ::rtl::OUStringHash; namespace cppu { @@ -137,7 +136,7 @@ struct FctPtrHash }; typedef std::unordered_map< - OUString, MappingEntry *, OUStringHash > t_OUString2Entry; + OUString, MappingEntry * > t_OUString2Entry; typedef std::unordered_map< uno_Mapping *, MappingEntry *, FctPtrHash > t_Mapping2Entry; -- cgit