This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 8cd8d3120d Replace hash_map with std::unordered_map for GCC 15
compatibility
8cd8d3120d is described below
commit 8cd8d3120d0361d1531ffd532d56dd4ed40af180
Author: Pedro F. Giffuni <[email protected]>
AuthorDate: Wed Nov 4 20:22:42 2026 -0500
Replace hash_map with std::unordered_map for GCC 15 compatibility
GCC 15 removed hash_map from libstdc++. Replace all hash_map usages
with std::unordered_map across bridges/except.cxx and remaining source
files, updating includes accordingly.
---
main/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx | 2 +-
main/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx | 2 +-
main/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx | 2 +-
main/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx | 2 +-
main/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx | 2 +-
main/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx | 2 +-
main/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx | 2 +-
main/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx | 2 +-
main/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx | 2 +-
main/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx | 2 +-
main/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx | 2 +-
main/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx | 2 +-
main/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx | 2 +-
main/bridges/source/cpp_uno/gcc3_netbsd_intel/except.cxx | 2 +-
main/bridges/source/cpp_uno/gcc3_os2_intel/except.cxx | 2 +-
main/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx | 2 +-
main/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx | 2 +-
main/bridges/source/cpp_uno/mingw_intel/except.cxx | 2 +-
main/bridges/source/cpp_uno/msvc_win32_intel/except.cxx | 2 +-
main/bridges/source/cpp_uno/msvc_win64_x86-64/except.cxx | 2 +-
main/bridges/source/cpp_uno/s5abi_macosx_aarch64/except.cxx | 6 +++---
main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx | 2 +-
main/bridges/source/jni_uno/jni_info.h | 4 ++--
main/desktop/source/deployment/inc/dp_persmap.h | 4 ++--
main/desktop/source/deployment/registry/inc/dp_backend.h | 4 ++--
main/framework/inc/stdtypes.h | 4 ++--
main/stoc/source/security/lru_cache.h | 4 ++--
main/vcl/inc/image.h | 4 ++--
main/vcl/inc/jobset.h | 4 ++--
main/vcl/inc/outdev.h | 4 ++--
main/vcl/inc/print.h | 4 ++--
31 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/main/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
b/main/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
index 9f6e55ed28..8f24e9173b 100644
--- a/main/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
+++ b/main/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
@@ -97,7 +97,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info *, OUStringHash >
t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/main/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
b/main/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
index 94f479e726..b3a5879007 100644
--- a/main/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
+++ b/main/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
@@ -96,7 +96,7 @@ namespace CPPU_CURRENT_NAMESPACE
//=====================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info *, OUStringHash >
t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/main/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
b/main/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
index 1f1f19b0a1..bb399142c0 100644
--- a/main/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
+++ b/main/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
@@ -96,7 +96,7 @@ namespace CPPU_CURRENT_NAMESPACE
//=====================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info *, OUStringHash >
t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/main/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
b/main/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
index 7c647e05b0..1b7ac9450d 100644
--- a/main/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
+++ b/main/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
@@ -97,7 +97,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info *, OUStringHash >
t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/main/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
b/main/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
index 96f1249228..2b75ef2991 100644
--- a/main/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
+++ b/main/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
@@ -104,7 +104,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info *, OUStringHash >
t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/main/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
b/main/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
index 1f1f19b0a1..bb399142c0 100644
--- a/main/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
+++ b/main/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
@@ -96,7 +96,7 @@ namespace CPPU_CURRENT_NAMESPACE
//=====================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info *, OUStringHash >
t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/main/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
b/main/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
index 0079a13ede..c3eaa9c5e1 100644
--- a/main/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
+++ b/main/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
@@ -93,7 +93,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info *, OUStringHash >
t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/main/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
b/main/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
index 888bccb614..de9abf6391 100644
--- a/main/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
+++ b/main/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
@@ -97,7 +97,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info *, OUStringHash >
t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/main/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
b/main/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
index 888bccb614..de9abf6391 100644
--- a/main/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
+++ b/main/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
@@ -97,7 +97,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info *, OUStringHash >
t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/main/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
b/main/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
index 7c647e05b0..1b7ac9450d 100644
--- a/main/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
+++ b/main/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
@@ -97,7 +97,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info *, OUStringHash >
t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/main/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
b/main/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
index 9f6e55ed28..8f24e9173b 100644
--- a/main/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
+++ b/main/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
@@ -97,7 +97,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info *, OUStringHash >
t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/main/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
b/main/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
index 64ff0f3b05..381289a297 100644
--- a/main/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
+++ b/main/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
@@ -96,7 +96,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info *, OUStringHash >
t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/main/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
b/main/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
index dfbf9b086d..0b2dbcefe8 100644
--- a/main/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
+++ b/main/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
@@ -98,7 +98,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info *, OUStringHash >
t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/main/bridges/source/cpp_uno/gcc3_netbsd_intel/except.cxx
b/main/bridges/source/cpp_uno/gcc3_netbsd_intel/except.cxx
index ba88f4c628..2330c111c2 100644
--- a/main/bridges/source/cpp_uno/gcc3_netbsd_intel/except.cxx
+++ b/main/bridges/source/cpp_uno/gcc3_netbsd_intel/except.cxx
@@ -99,7 +99,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info *, OUStringHash >
t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/main/bridges/source/cpp_uno/gcc3_os2_intel/except.cxx
b/main/bridges/source/cpp_uno/gcc3_os2_intel/except.cxx
index 3ac46e7dde..c460560ffe 100644
--- a/main/bridges/source/cpp_uno/gcc3_os2_intel/except.cxx
+++ b/main/bridges/source/cpp_uno/gcc3_os2_intel/except.cxx
@@ -113,7 +113,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info *, OUStringHash >
t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/main/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
b/main/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
index a61fde91f4..72ba50221a 100644
--- a/main/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
+++ b/main/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
@@ -97,7 +97,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info *, OUStringHash >
t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/main/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
b/main/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
index c3658af19d..6d4c4fdbe4 100644
--- a/main/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
+++ b/main/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
@@ -95,7 +95,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info *, OUStringHash >
t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/main/bridges/source/cpp_uno/mingw_intel/except.cxx
b/main/bridges/source/cpp_uno/mingw_intel/except.cxx
index b38f3f0092..92b997c732 100644
--- a/main/bridges/source/cpp_uno/mingw_intel/except.cxx
+++ b/main/bridges/source/cpp_uno/mingw_intel/except.cxx
@@ -97,7 +97,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info *, OUStringHash >
t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/main/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
b/main/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
index 2a5548afb1..fef28816bc 100644
--- a/main/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
+++ b/main/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
@@ -100,7 +100,7 @@ static inline OUString toRTTIname( OUString const &
rUNOname ) throw ()
//##################################################################################################
-typedef hash_map< OUString, void *, OUStringHash, equal_to< OUString > >
t_string2PtrMap;
+typedef std::unordered_map< OUString, void *, OUStringHash, equal_to< OUString
> > t_string2PtrMap;
//==================================================================================================
class RTTInfos
diff --git a/main/bridges/source/cpp_uno/msvc_win64_x86-64/except.cxx
b/main/bridges/source/cpp_uno/msvc_win64_x86-64/except.cxx
index 9e57720a08..e2cde1caf2 100644
--- a/main/bridges/source/cpp_uno/msvc_win64_x86-64/except.cxx
+++ b/main/bridges/source/cpp_uno/msvc_win64_x86-64/except.cxx
@@ -161,7 +161,7 @@ static inline OUString toRTTIname( OUString const &
rUNOname ) throw ()
//##################################################################################################
-typedef hash_map< OUString, void *, OUStringHash, equal_to< OUString > >
t_string2PtrMap;
+typedef std::unordered_map< OUString, void *, OUStringHash, equal_to< OUString
> > t_string2PtrMap;
//==================================================================================================
class RTTInfos
diff --git a/main/bridges/source/cpp_uno/s5abi_macosx_aarch64/except.cxx
b/main/bridges/source/cpp_uno/s5abi_macosx_aarch64/except.cxx
index 238cdb2f68..f7e9343c84 100644
--- a/main/bridges/source/cpp_uno/s5abi_macosx_aarch64/except.cxx
+++ b/main/bridges/source/cpp_uno/s5abi_macosx_aarch64/except.cxx
@@ -61,8 +61,8 @@ namespace CPPU_CURRENT_NAMESPACE
namespace {
-typedef hash_map< void *, typelib_TypeDescription * > ThrownTypes;
-typedef hash_map< OUString, type_info *, OUStringHash > ObservedRttiMap;
+typedef std::unordered_map< void *, typelib_TypeDescription * > ThrownTypes;
+typedef std::unordered_map< OUString, type_info *, OUStringHash >
ObservedRttiMap;
ThrownTypes & thrownTypes()
{
@@ -183,7 +183,7 @@ static OString mangledRttiSymbol( OUString const & unoName
) SAL_THROW( () )
//==================================================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info *, OUStringHash >
t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx
b/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx
index 60784a4172..93c46683b7 100644
--- a/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx
+++ b/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx
@@ -103,7 +103,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, type_info *, OUStringHash >
t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/main/bridges/source/jni_uno/jni_info.h
b/main/bridges/source/jni_uno/jni_info.h
index d4a3d17812..8ca2326dbd 100644
--- a/main/bridges/source/jni_uno/jni_info.h
+++ b/main/bridges/source/jni_uno/jni_info.h
@@ -24,7 +24,7 @@
#if ! defined INCLUDED_JNI_INFO_H
#define INCLUDED_JNI_INFO_H
-#include <hash_map>
+#include <unordered_map>
#include "jni_base.h"
@@ -116,7 +116,7 @@ struct JNI_type_info_holder
{}
};
-typedef ::std::hash_map<
+typedef ::std::unordered_map<
::rtl::OUString, JNI_type_info_holder, ::rtl::OUStringHash > t_str2type;
//==============================================================================
diff --git a/main/desktop/source/deployment/inc/dp_persmap.h
b/main/desktop/source/deployment/inc/dp_persmap.h
index 43d215a342..4a6e07c743 100644
--- a/main/desktop/source/deployment/inc/dp_persmap.h
+++ b/main/desktop/source/deployment/inc/dp_persmap.h
@@ -24,12 +24,12 @@
#include "rtl/ustring.hxx"
#include "osl/file.hxx"
-#include <hash_map>
+#include <unordered_map>
namespace dp_misc
{
-typedef ::std::hash_map<
+typedef ::std::unordered_map<
::rtl::OString, ::rtl::OString, ::rtl::OStringHash > t_string2string_map;
//==============================================================================
diff --git a/main/desktop/source/deployment/registry/inc/dp_backend.h
b/main/desktop/source/deployment/registry/inc/dp_backend.h
index abbd880e45..dc0ca1453f 100644
--- a/main/desktop/source/deployment/registry/inc/dp_backend.h
+++ b/main/desktop/source/deployment/registry/inc/dp_backend.h
@@ -38,7 +38,7 @@
#include "com/sun/star/deployment/XPackageManager.hpp"
#include "com/sun/star/deployment/InvalidRemovedParameterException.hpp"
#include <memory>
-#include <hash_map>
+#include <unordered_map>
#include <list>
#include "dp_registry.hrc"
@@ -218,7 +218,7 @@ class PackageRegistryBackend
// XPackageManager::getDeployedPackages is called often. This results in a
lot
//of bindPackage calls which are costly. Therefore we keep hard references
in
//the map now.
- typedef ::std::hash_map<
+ typedef ::std::unordered_map<
::rtl::OUString, css::uno::Reference<css::deployment::XPackage>,
::rtl::OUStringHash > t_string2ref;
t_string2ref m_bound;
diff --git a/main/framework/inc/stdtypes.h b/main/framework/inc/stdtypes.h
index 27f113f5d5..a02e637bd5 100644
--- a/main/framework/inc/stdtypes.h
+++ b/main/framework/inc/stdtypes.h
@@ -26,7 +26,7 @@
#include <vector>
#include <queue>
-#include <hash_map>
+#include <unordered_map>
//_________________________________________________________________________________________________________________
// own includes
@@ -152,7 +152,7 @@ typedef ::std::queue< ::rtl::OUString > OUStringQueue;
is missing at the normal hash implementation.
*/
template< class TType >
-class BaseHash : public ::std::hash_map< ::rtl::OUString ,
+class BaseHash : public ::std::unordered_map< ::rtl::OUString
,
TType ,
rtl::OUStringHash ,
::std::equal_to< ::rtl::OUString > >
diff --git a/main/stoc/source/security/lru_cache.h
b/main/stoc/source/security/lru_cache.h
index b223667cb6..022648b06d 100644
--- a/main/stoc/source/security/lru_cache.h
+++ b/main/stoc/source/security/lru_cache.h
@@ -23,7 +23,7 @@
#ifndef _STOC_SEC_LRU_CACHE_H_
#define _STOC_SEC_LRU_CACHE_H_
-#include <hash_map>
+#include <unordered_map>
// __CACHE_DIAGNOSE works only for OUString keys
#ifdef __CACHE_DIAGNOSE
@@ -49,7 +49,7 @@ class lru_cache
Entry * m_pred;
Entry * m_succ;
};
- typedef ::std::hash_map< t_key, Entry *, t_hashKey, t_equalKey >
t_key2element;
+ typedef ::std::unordered_map< t_key, Entry *, t_hashKey, t_equalKey >
t_key2element;
t_key2element m_key2element;
::std::size_t m_size;
diff --git a/main/vcl/inc/image.h b/main/vcl/inc/image.h
index 70e2d4cd04..a8ce256560 100644
--- a/main/vcl/inc/image.h
+++ b/main/vcl/inc/image.h
@@ -26,7 +26,7 @@
#include <vcl/bitmapex.hxx>
-#include <hash_map>
+#include <unordered_map>
// ----------------
// - ImplImageBmp -
@@ -107,7 +107,7 @@ struct ImageAryData
struct ImplImageList
{
typedef std::vector<ImageAryData *> ImageAryDataVec;
- typedef std::hash_map< rtl::OUString, ImageAryData *, rtl::OUStringHash >
+ typedef std::unordered_map< rtl::OUString, ImageAryData *,
rtl::OUStringHash >
ImageAryDataNameHash;
ImageAryDataVec maImages;
diff --git a/main/vcl/inc/jobset.h b/main/vcl/inc/jobset.h
index b8236143df..278cf6f2f7 100644
--- a/main/vcl/inc/jobset.h
+++ b/main/vcl/inc/jobset.h
@@ -27,7 +27,7 @@
#include <tools/string.hxx>
#include <vcl/sv.h>
#include <vcl/prntypes.hxx>
-#include <hash_map>
+#include <unordered_map>
#include <rtl/ustring.hxx>
// ------------------
@@ -60,7 +60,7 @@ struct ImplJobSetup
long mnPaperHeight; // paper height (100th
mm)
sal_uIntPtr mnDriverDataLen; // length of
system specific data
sal_uInt8* mpDriverData; // system
specific data (will be streamed a byte block)
- ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash
> maValueMap;
+ ::std::unordered_map< ::rtl::OUString, ::rtl::OUString,
::rtl::OUStringHash > maValueMap;
ImplJobSetup();
ImplJobSetup( const ImplJobSetup&
rJobSetup );
diff --git a/main/vcl/inc/outdev.h b/main/vcl/inc/outdev.h
index 3e21ef1ff3..f0d048946f 100644
--- a/main/vcl/inc/outdev.h
+++ b/main/vcl/inc/outdev.h
@@ -213,11 +213,11 @@ private:
// cache of recently used font instances
struct IFSD_Equal { bool operator()( const ImplFontSelectData&, const
ImplFontSelectData& ) const; };
struct IFSD_Hash { size_t operator()( const ImplFontSelectData& ) const; };
- typedef
::std::hash_map<ImplFontSelectData,ImplFontEntry*,IFSD_Hash,IFSD_Equal >
FontInstanceList;
+ typedef
::std::unordered_map<ImplFontSelectData,ImplFontEntry*,IFSD_Hash,IFSD_Equal >
FontInstanceList;
FontInstanceList maFontInstanceList;
// cache of recently requested font names vs. selected font names
- typedef ::std::hash_map<String,String,FontNameHash> FontNameList;
+ typedef ::std::unordered_map<String,String,FontNameHash> FontNameList;
FontNameList maFontNameList;
public:
diff --git a/main/vcl/inc/print.h b/main/vcl/inc/print.h
index 9313f976cd..9ccf5e4210 100644
--- a/main/vcl/inc/print.h
+++ b/main/vcl/inc/print.h
@@ -30,7 +30,7 @@
#include "rtl/ustring.hxx"
#include <vector>
-#include <hash_map>
+#include <unordered_map>
struct SalPrinterQueueInfo;
class QueueInfo;
@@ -56,7 +56,7 @@ struct ImplPrnQueueData
class VCL_PLUGIN_PUBLIC ImplPrnQueueList
{
public:
- std::hash_map< rtl::OUString, sal_Int32, rtl::OUStringHash >
+ std::unordered_map< rtl::OUString, sal_Int32, rtl::OUStringHash >
m_aNameToIndex;
std::vector< ImplPrnQueueData > m_aQueueInfos;
std::vector< rtl::OUString > m_aPrinterList;
