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 --- basic/source/classes/sb.cxx | 3 +-- basic/source/classes/sbunoobj.cxx | 2 +- basic/source/inc/namecont.hxx | 2 +- basic/source/inc/sbunoobj.hxx | 2 +- basic/source/inc/scriptcont.hxx | 4 ++-- 5 files changed, 6 insertions(+), 7 deletions(-) (limited to 'basic') diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 1ce0e4b65b5b..b2aaae37cdab 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -1138,8 +1138,7 @@ struct ClassModuleRunInitItem // Derive from unordered_map type instead of typedef // to allow forward declaration in sbmod.hxx class ModuleInitDependencyMap : public - std::unordered_map< OUString, ClassModuleRunInitItem, - OUStringHash > + std::unordered_map< OUString, ClassModuleRunInitItem > {}; void SbModule::implProcessModuleRunInit( ModuleInitDependencyMap& rMap, ClassModuleRunInitItem& rItem ) diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 0dea0076bc90..1be0133628df 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -3205,7 +3205,7 @@ Reference< XTypeDescriptionEnumeration > getTypeDescriptorEnumeration( const OUS return xEnum; } -typedef std::unordered_map< OUString, Any, OUStringHash > VBAConstantsHash; +typedef std::unordered_map< OUString, Any > VBAConstantsHash; VBAConstantHelper& VBAConstantHelper::instance() diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx index 5cc2c0d11992..875e15a60897 100644 --- a/basic/source/inc/namecont.hxx +++ b/basic/source/inc/namecont.hxx @@ -69,7 +69,7 @@ typedef ::cppu::WeakImplHelper< class NameContainer : public ::cppu::BaseMutex, public NameContainer_BASE { - typedef std::unordered_map < OUString, sal_Int32, OUStringHash > NameContainerNameMap; + typedef std::unordered_map < OUString, sal_Int32 > NameContainerNameMap; NameContainerNameMap mHashMap; std::vector< OUString > mNames; diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx index 2fae21ecf514..b31e34966d4e 100644 --- a/basic/source/inc/sbunoobj.hxx +++ b/basic/source/inc/sbunoobj.hxx @@ -364,7 +364,7 @@ public: virtual void Clear() override; }; -typedef std::unordered_map< OUString, css::uno::Any, OUStringHash > VBAConstantsHash; +typedef std::unordered_map< OUString, css::uno::Any > VBAConstantsHash; typedef std::vector< OUString > VBAConstantsVector; diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx index 58b26077e9ac..1b0831a7701e 100644 --- a/basic/source/inc/scriptcont.hxx +++ b/basic/source/inc/scriptcont.hxx @@ -103,7 +103,7 @@ public: }; -typedef std::unordered_map< OUString, css::script::ModuleInfo, OUStringHash > ModuleInfoMap; +typedef std::unordered_map< OUString, css::script::ModuleInfo > ModuleInfoMap; typedef ::cppu::ImplHelper1< css::script::vba::XVBAModuleInfo > SfxScriptLibrary_BASE; @@ -111,7 +111,7 @@ class SfxScriptLibrary : public SfxLibrary, public SfxScriptLibrary_BASE { friend class SfxScriptLibraryContainer; - typedef std::unordered_map< OUString, css::script::ModuleInfo, OUStringHash > ModuleInfoMap; + typedef std::unordered_map< OUString, css::script::ModuleInfo > ModuleInfoMap; bool mbLoadedSource; bool mbLoadedBinary; -- cgit