summaryrefslogtreecommitdiff
path: root/bridges
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 /bridges
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 'bridges')
-rw-r--r--bridges/inc/vtablefactory.hxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_ios/except.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_arm/except.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_intel/except.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_mips/except.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_mips64/except.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_s390/except.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_sparc64/except.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx2
-rw-r--r--bridges/source/cpp_uno/msvc_win32_intel/except.cxx2
-rw-r--r--bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx2
-rw-r--r--bridges/source/cpp_uno/shared/vtablefactory.cxx2
-rw-r--r--bridges/source/jni_uno/jni_info.h2
26 files changed, 26 insertions, 26 deletions
diff --git a/bridges/inc/vtablefactory.hxx b/bridges/inc/vtablefactory.hxx
index e099f3b3251a..991716b423e8 100644
--- a/bridges/inc/vtablefactory.hxx
+++ b/bridges/inc/vtablefactory.hxx
@@ -207,7 +207,7 @@ private:
static void flushCode(
unsigned char const * begin, unsigned char const * end);
- typedef std::unordered_map< OUString, Vtables, OUStringHash > Map;
+ typedef std::unordered_map< OUString, Vtables > Map;
osl::Mutex m_mutex;
Map m_map;
diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
index c5117ac40b6f..fe3c1f391147 100644
--- a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
@@ -88,7 +88,7 @@ static OUString toUNOname( char const * p )
class RTTI
{
- typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info * > t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_ios/except.cxx b/bridges/source/cpp_uno/gcc3_ios/except.cxx
index 1d1eeccd97ae..17b95473f92c 100644
--- a/bridges/source/cpp_uno/gcc3_ios/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios/except.cxx
@@ -143,7 +143,7 @@ static OUString toUNOname( char const * p )
class RTTI
{
- typedef std::unordered_map< OUString, std::type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, std::type_info * > t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
index 1620467baae9..fa6ffebfbc17 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
@@ -81,7 +81,7 @@ public:
std::type_info * getRtti(typelib_TypeDescription const & type);
private:
- typedef std::unordered_map<OUString, std::type_info *, OUStringHash> Map;
+ typedef std::unordered_map<OUString, std::type_info *> Map;
void * app_;
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
index 74dabc8acc77..1a51c6e6786a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
@@ -85,7 +85,7 @@ static OUString toUNOname( char const * p )
class RTTI
{
- typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info * > t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
index a025c82f3e59..43e255c21cf6 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
@@ -87,7 +87,7 @@ namespace CPPU_CURRENT_NAMESPACE
class RTTI
{
- typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info * > t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
index 855e75cfe8b4..3464ad7c3d39 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
@@ -87,7 +87,7 @@ namespace CPPU_CURRENT_NAMESPACE
class RTTI
{
- typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info * > t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
index 95688e33f7d0..27d6bc1a2cbe 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
@@ -85,7 +85,7 @@ static OUString toUNOname( char const * p )
class RTTI
{
- typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info * > t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
index 3a67731321d5..6bbcfb2565c1 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
@@ -84,7 +84,7 @@ static OUString toUNOname( char const * p )
class RTTI
{
- typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info * > t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
index 6f0581d31bf2..27a587117145 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
@@ -87,7 +87,7 @@ namespace CPPU_CURRENT_NAMESPACE
class RTTI
{
- typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info * > t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
index 50220539498e..01a4446eb19c 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
@@ -84,7 +84,7 @@ static OUString toUNOname( char const * p )
class RTTI
{
- typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info * > t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_mips64/except.cxx
index 0e6537256356..e17e5fba14bf 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips64/except.cxx
@@ -85,7 +85,7 @@ static OUString toUNOname( char const * p )
class RTTI
{
- typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info * > t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
index 225a241d412d..cd6c79581736 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
@@ -85,7 +85,7 @@ static OUString toUNOname( char const * p )
class RTTI
{
- typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info * > t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
index 95688e33f7d0..27d6bc1a2cbe 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
@@ -85,7 +85,7 @@ static OUString toUNOname( char const * p )
class RTTI
{
- typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info * > t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
index 74dabc8acc77..1a51c6e6786a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
@@ -85,7 +85,7 @@ static OUString toUNOname( char const * p )
class RTTI
{
- typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info * > t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
index 6049fb5094cd..9fc893371039 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
@@ -85,7 +85,7 @@ static OUString toUNOname( char const * p )
class RTTI
{
- typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info * > t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
index 261339c2b533..457ab485d21a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
@@ -85,7 +85,7 @@ static OUString toUNOname( char const * p )
class RTTI
{
- typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info * > t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc64/except.cxx
index 261339c2b533..457ab485d21a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc64/except.cxx
@@ -85,7 +85,7 @@ static OUString toUNOname( char const * p )
class RTTI
{
- typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info * > t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
index 1bc4a8e6caa0..4d6683ff5640 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
@@ -41,7 +41,7 @@ namespace {
class RTTI
{
- typedef std::unordered_map< OUString, std::type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, std::type_info * > t_rtti_map;
osl::Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
index 1d1eeccd97ae..17b95473f92c 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
@@ -143,7 +143,7 @@ static OUString toUNOname( char const * p )
class RTTI
{
- typedef std::unordered_map< OUString, std::type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, std::type_info * > t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
index 8e403ac522c8..0b484521f7a1 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
@@ -87,7 +87,7 @@ static OUString toUNOname( char const * p )
class RTTI
{
- typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info * > t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
index 7b957003b4d1..18326431dbad 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
@@ -84,7 +84,7 @@ static OUString toUNOname( char const * p )
class RTTI
{
- typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info * > t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
index 3fa94744d296..656dab7aa323 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
@@ -83,7 +83,7 @@ static inline OUString toRTTIname( OUString const & rUNOname ) throw ()
//#### RTTI simulation #############################################################################
-typedef std::unordered_map< OUString, void *, OUStringHash > t_string2PtrMap;
+typedef std::unordered_map< OUString, void * > t_string2PtrMap;
class RTTInfos
{
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
index 6dafb7396fd4..b96d354f14cd 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
@@ -306,7 +306,7 @@ static inline OUString toRTTIname(
//RTTI simulation
-typedef std::unordered_map< OUString, void *, OUStringHash > t_string2PtrMap;
+typedef std::unordered_map< OUString, void * > t_string2PtrMap;
class type_info_descriptor;
class RTTInfos
diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx
index 6df5acbff883..47a4af246977 100644
--- a/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -155,7 +155,7 @@ private:
sal_Int32 calculate(
typelib_InterfaceTypeDescription * type, sal_Int32 offset);
- std::unordered_map< OUString, sal_Int32, OUStringHash > m_map;
+ std::unordered_map< OUString, sal_Int32 > m_map;
};
sal_Int32 VtableFactory::BaseOffset::calculate(
diff --git a/bridges/source/jni_uno/jni_info.h b/bridges/source/jni_uno/jni_info.h
index f40c26e88eef..a8d395c6e309 100644
--- a/bridges/source/jni_uno/jni_info.h
+++ b/bridges/source/jni_uno/jni_info.h
@@ -119,7 +119,7 @@ struct JNI_type_info_holder
};
typedef std::unordered_map<
- OUString, JNI_type_info_holder, OUStringHash > t_str2type;
+ OUString, JNI_type_info_holder > t_str2type;
class JNI_info
{