summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-10-19 17:18:17 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-10-23 08:15:35 +0200
commit87a9979c8938b800aab6e35903d60d24892e7f2e (patch)
tree6beb01f22537e63df24c023ab65d391a7bee0cf6 /ucb
parentd76c4e5c9aaf8bd27ec97679bcaeba5b18aca493 (diff)
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>
Diffstat (limited to 'ucb')
-rw-r--r--ucb/source/core/ucbstore.cxx8
-rw-r--r--ucb/source/ucp/file/filnot.hxx3
-rw-r--r--ucb/source/ucp/file/filtask.hxx2
-rw-r--r--ucb/source/ucp/hierarchy/hierarchyprovider.hxx5
-rw-r--r--ucb/source/ucp/package/pkgprovider.cxx8
-rw-r--r--ucb/source/ucp/webdav-neon/ContentProperties.hxx8
-rw-r--r--ucb/source/ucp/webdav/ContentProperties.hxx8
-rw-r--r--ucb/source/ucp/webdav/webdavresponseparser.cxx2
8 files changed, 9 insertions, 35 deletions
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;