From 87a9979c8938b800aab6e35903d60d24892e7f2e Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
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 <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 ucb/source/core/ucbstore.cxx                     | 8 +-------
 ucb/source/ucp/file/filnot.hxx                   | 3 +--
 ucb/source/ucp/file/filtask.hxx                  | 2 +-
 ucb/source/ucp/hierarchy/hierarchyprovider.hxx   | 5 ++---
 ucb/source/ucp/package/pkgprovider.cxx           | 8 +-------
 ucb/source/ucp/webdav-neon/ContentProperties.hxx | 8 +-------
 ucb/source/ucp/webdav/ContentProperties.hxx      | 8 +-------
 ucb/source/ucp/webdav/webdavresponseparser.cxx   | 2 +-
 8 files changed, 9 insertions(+), 35 deletions(-)

(limited to 'ucb')

diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index 23aa09b0a48f..62e154b9553c 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -105,13 +105,7 @@ OUString makeHierarchalNameSegment( const OUString & rIn  )
 #define CFGPROPERTY_NODEPATH        "nodepath"
 
 // PropertySetMap_Impl.
-typedef std::unordered_map
-<
-    OUString,
-    PersistentPropertySet*,
-    OUStringHash
->
-PropertySetMap_Impl;
+typedef std::unordered_map< OUString, PersistentPropertySet*> PropertySetMap_Impl;
 
 // class PropertySetInfo_Impl
 class PropertySetInfo_Impl : public cppu::WeakImplHelper < XPropertySetInfo >
diff --git a/ucb/source/ucp/file/filnot.hxx b/ucb/source/ucp/file/filnot.hxx
index 0a80f0f05920..c1f9555cba15 100644
--- a/ucb/source/ucp/file/filnot.hxx
+++ b/ucb/source/ucp/file/filnot.hxx
@@ -78,8 +78,7 @@ namespace fileaccess {
 
 
     typedef std::unordered_map< OUString,
-                           css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >,
-                           OUStringHash >      ListenerMap;
+                           css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > >  ListenerMap;
 
     class PropertyChangeNotifier
     {
diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx
index 24e719b3ebb8..86ea95eb07b6 100644
--- a/ucb/source/ucp/file/filtask.hxx
+++ b/ucb/source/ucp/file/filtask.hxx
@@ -245,7 +245,7 @@ namespace fileaccess
             css::uno::Reference< css::beans::XPropertyAccess >        xA;
         };
 
-        typedef std::unordered_map< OUString,UnqPathData,OUStringHash > ContentMap;
+        typedef std::unordered_map< OUString,UnqPathData > ContentMap;
 
         TaskManager( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                FileProvider* pProvider, bool bWithConfig );
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
index 4bde1b14600f..423965eb26fe 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
@@ -56,9 +56,8 @@ struct ConfigProviderMapEntry
 
 typedef std::unordered_map
 <
-    OUString,  // servcie specifier
-    ConfigProviderMapEntry,
-    OUStringHash
+    OUString,  // service specifier
+    ConfigProviderMapEntry
 >
 ConfigProviderMap;
 
diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx
index 93b22fd1ffee..28f3df48b2f5 100644
--- a/ucb/source/ucp/package/pkgprovider.cxx
+++ b/ucb/source/ucp/package/pkgprovider.cxx
@@ -82,13 +82,7 @@ public:
 
 
 // Packages.
-typedef std::unordered_map
-<
-    OUString,
-    Package*,
-    OUStringHash
->
-PackageMap;
+typedef std::unordered_map<OUString, Package*> PackageMap;
 
 class Packages : public PackageMap {};
 
diff --git a/ucb/source/ucp/webdav-neon/ContentProperties.hxx b/ucb/source/ucp/webdav-neon/ContentProperties.hxx
index ffab2655bbbd..0606d94b6d24 100644
--- a/ucb/source/ucp/webdav-neon/ContentProperties.hxx
+++ b/ucb/source/ucp/webdav-neon/ContentProperties.hxx
@@ -67,13 +67,7 @@ public:
 
 };
 
-typedef std::unordered_map
-<
-    OUString,
-    PropertyValue,
-    OUStringHash
->
-PropertyValueMap;
+typedef std::unordered_map< OUString, PropertyValue> PropertyValueMap;
 
 class ContentProperties
 {
diff --git a/ucb/source/ucp/webdav/ContentProperties.hxx b/ucb/source/ucp/webdav/ContentProperties.hxx
index c76dcf5d2cd4..cd0f769b9c55 100644
--- a/ucb/source/ucp/webdav/ContentProperties.hxx
+++ b/ucb/source/ucp/webdav/ContentProperties.hxx
@@ -58,13 +58,7 @@ public:
 
 };
 
-typedef std::unordered_map
-<
-    OUString,
-    PropertyValue,
-    OUStringHash
->
-PropertyValueMap;
+typedef std::unordered_map< OUString, PropertyValue > PropertyValueMap;
 
 class ContentProperties
 {
diff --git a/ucb/source/ucp/webdav/webdavresponseparser.cxx b/ucb/source/ucp/webdav/webdavresponseparser.cxx
index 94b5952c249f..25b99d74252b 100644
--- a/ucb/source/ucp/webdav/webdavresponseparser.cxx
+++ b/ucb/source/ucp/webdav/webdavresponseparser.cxx
@@ -96,7 +96,7 @@ namespace
 
     WebDAVName StrToWebDAVName(const OUString& rStr)
     {
-        typedef std::unordered_map< OUString, WebDAVName, OUStringHash > WebDAVNameMapper;
+        typedef std::unordered_map< OUString, WebDAVName > WebDAVNameMapper;
         typedef std::pair< OUString, WebDAVName > WebDAVNameValueType;
         static WebDAVNameMapper aWebDAVNameMapperList;
 
-- 
cgit v1.2.3