summaryrefslogtreecommitdiffstats
path: root/stoc
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 /stoc
parenttdf#113353 gtk2: No decoration for floating toolbars (diff)
downloadcore-87a9979c8938b800aab6e35903d60d24892e7f2e.tar.gz
core-87a9979c8938b800aab6e35903d60d24892e7f2e.zip
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 'stoc')
-rw-r--r--stoc/source/corereflection/base.hxx6
-rw-r--r--stoc/source/inspect/introspection.cxx6
-rw-r--r--stoc/source/namingservice/namingservice.cxx7
-rw-r--r--stoc/source/security/file_policy.cxx2
-rw-r--r--stoc/source/servicemanager/servicemanager.cxx9
5 files changed, 9 insertions, 21 deletions
diff --git a/stoc/source/corereflection/base.hxx b/stoc/source/corereflection/base.hxx
index 6638493ad3fa..8c01dd3ddf0c 100644
--- a/stoc/source/corereflection/base.hxx
+++ b/stoc/source/corereflection/base.hxx
@@ -74,10 +74,8 @@ inline bool td_equals( typelib_TypeDescription * pTD, typelib_TypeDescriptionRef
rtl_ustr_compare( pTD->pTypeName->buffer, pType->pTypeName->buffer ) == 0));
}
-typedef std::unordered_map< OUString, css::uno::WeakReference< css::reflection::XIdlField >,
- OUStringHash > OUString2Field;
-typedef std::unordered_map< OUString, css::uno::WeakReference< css::reflection::XIdlMethod >,
- OUStringHash > OUString2Method;
+typedef std::unordered_map< OUString, css::uno::WeakReference< css::reflection::XIdlField > > OUString2Field;
+typedef std::unordered_map< OUString, css::uno::WeakReference< css::reflection::XIdlMethod > > OUString2Method;
class IdlReflectionServiceImpl
diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx
index 3bb086d5ad7d..870a74a9bd55 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -143,8 +143,7 @@ bool isDerivedFrom( const Reference<XIdlClass>& xToTestClass, const Reference<XI
typedef std::unordered_map
<
OUString,
- sal_Int32,
- OUStringHash
+ sal_Int32
>
IntrospectionNameMap;
@@ -154,8 +153,7 @@ IntrospectionNameMap;
typedef std::unordered_map
<
OUString,
- OUString,
- OUStringHash
+ OUString
>
LowerToExactNameMap;
diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx
index 88787b7b5515..5fd2761d041a 100644
--- a/stoc/source/namingservice/namingservice.cxx
+++ b/stoc/source/namingservice/namingservice.cxx
@@ -60,12 +60,7 @@ static OUString ns_getImplementationName()
return OUString(IMPLNAME);
}
-typedef std::unordered_map
-<
- OUString,
- Reference<XInterface >,
- OUStringHash
-> HashMap_OWString_Interface;
+typedef std::unordered_map< OUString, Reference<XInterface > > HashMap_OWString_Interface;
class NamingService_Impl
diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx
index 31bdcdbcc7c1..6036f4b46f51 100644
--- a/stoc/source/security/file_policy.cxx
+++ b/stoc/source/security/file_policy.cxx
@@ -63,7 +63,7 @@ class FilePolicy
AccessControl m_ac;
Sequence< Any > m_defaultPermissions;
- typedef std::unordered_map< OUString, Sequence< Any >, OUStringHash > t_permissions;
+ typedef std::unordered_map< OUString, Sequence< Any > > t_permissions;
t_permissions m_userPermissions;
bool m_init;
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index 0c222301cb15..e35ac7427996 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -278,22 +278,19 @@ Any ImplementationEnumeration_Impl::nextElement()
*****************************************************************************/
typedef std::unordered_set
<
- OUString,
- OUStringHash
+ OUString
> HashSet_OWString;
typedef std::unordered_multimap
<
OUString,
- Reference<XInterface >,
- OUStringHash
+ Reference<XInterface >
> HashMultimap_OWString_Interface;
typedef std::unordered_map
<
OUString,
- Reference<XInterface >,
- OUStringHash
+ Reference<XInterface >
> HashMap_OWString_Interface;
/*****************************************************************************