[Libreoffice-commits] .: bridges/inc bridges/source
Fridrich Strba
fridrich at kemper.freedesktop.org
Thu Feb 3 15:02:49 PST 2011
bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx | 4 ++--
bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx | 4 ++--
bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx | 4 ++--
bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx | 2 +-
bridges/source/cpp_uno/gcc3_linux_arm/except.cxx | 4 ++--
bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx | 2 +-
bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx | 4 ++--
bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx | 4 ++--
bridges/source/cpp_uno/gcc3_linux_intel/except.cxx | 4 ++--
bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx | 2 +-
bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx | 4 ++--
bridges/source/cpp_uno/gcc3_linux_mips/except.cxx | 4 ++--
bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx | 4 ++--
bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx | 4 ++--
bridges/source/cpp_uno/gcc3_linux_s390/except.cxx | 4 ++--
bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx | 4 ++--
bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx | 4 ++--
bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx | 2 +-
bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx | 4 ++--
bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx | 4 ++--
bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx | 4 ++--
bridges/source/cpp_uno/gcc3_os2_intel/except.cxx | 4 ++--
bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx | 4 ++--
bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx | 4 ++--
bridges/source/cpp_uno/mingw_intel/except.cxx | 4 ++--
bridges/source/cpp_uno/msvc_win32_intel/except.cxx | 4 ++--
bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx | 4 ++--
bridges/source/cpp_uno/shared/vtablefactory.cxx | 4 ++--
bridges/source/jni_uno/jni_info.h | 4 ++--
bridges/source/remote/context/context.cxx | 4 ++--
bridges/source/remote/urp/urp_replycontainer.hxx | 4 ++--
31 files changed, 58 insertions(+), 58 deletions(-)
New commits:
commit 6030d8ac9410fc1fcade35d7f7fb31eedfd86950
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date: Thu Feb 3 16:00:54 2011 -0700
move bridges to boost::unordered_map
diff --git a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
index 680dee6..59924a2 100644
--- a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
@@ -35,7 +35,7 @@
#include "sal/types.h"
#include "typelib/typedescription.hxx"
-#include <hash_map>
+#include <boost/unordered_map.hpp>
/*See: http://people.redhat.com/drepper/selinux-mem.html*/
#if defined(LINUX) || defined(OPENBSD) || defined(FREEBSD) \
@@ -203,7 +203,7 @@ private:
static void flushCode(
unsigned char const * begin, unsigned char const * end);
- typedef std::hash_map< rtl::OUString, Vtables, rtl::OUStringHash > Map;
+ typedef boost::unordered_map< rtl::OUString, Vtables, rtl::OUStringHash > 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 c3b7818..2086ef7 100644
--- a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
@@ -32,7 +32,7 @@
#include <stdio.h>
#include <dlfcn.h>
#include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
@@ -102,7 +102,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
index ea69610..00a0125 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
@@ -33,7 +33,7 @@
#include <string.h>
#include <dlfcn.h>
#include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
@@ -102,7 +102,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
index 4097ef6..e08ba39 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
@@ -27,7 +27,7 @@
************************************************************************/
#include <malloc.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <rtl/alloc.h>
#include <osl/mutex.hxx>
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
index 3b9a69e..da7db02 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
@@ -30,7 +30,7 @@
#include <string.h>
#include <dlfcn.h>
#include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
@@ -101,7 +101,7 @@ namespace CPPU_CURRENT_NAMESPACE
//=====================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
index 3462729..bfdecbf 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
@@ -27,7 +27,7 @@
************************************************************************/
#include <malloc.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <rtl/alloc.h>
#include <osl/mutex.hxx>
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
index 1edbac7..b8a335a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
@@ -30,7 +30,7 @@
#include <string.h>
#include <dlfcn.h>
#include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
@@ -101,7 +101,7 @@ namespace CPPU_CURRENT_NAMESPACE
//=====================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef boost::unordered_map< OUString, type_info *, OUStringHash > 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 ea69610..00a0125 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
@@ -33,7 +33,7 @@
#include <string.h>
#include <dlfcn.h>
#include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
@@ -102,7 +102,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef boost::unordered_map< OUString, type_info *, OUStringHash > 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 1d28d05..152f7db 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
@@ -32,7 +32,7 @@
#include <stdio.h>
#include <string.h>
#include <dlfcn.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <cxxabi.h>
@@ -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 boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
index 792c1df..1aab46b 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
@@ -27,7 +27,7 @@
************************************************************************/
#include <malloc.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <rtl/alloc.h>
#include <osl/mutex.hxx>
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
index 1edbac7..b8a335a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
@@ -30,7 +30,7 @@
#include <string.h>
#include <dlfcn.h>
#include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
@@ -101,7 +101,7 @@ namespace CPPU_CURRENT_NAMESPACE
//=====================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef boost::unordered_map< OUString, type_info *, OUStringHash > 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 eddd17e..ca6ff7b 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
@@ -29,7 +29,7 @@
#include <string.h>
#include <dlfcn.h>
#include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
@@ -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 boost::unordered_map< OUString, type_info *, OUStringHash > 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 ea69610..00a0125 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
@@ -33,7 +33,7 @@
#include <string.h>
#include <dlfcn.h>
#include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
@@ -102,7 +102,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef boost::unordered_map< OUString, type_info *, OUStringHash > 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 ea69610..00a0125 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
@@ -33,7 +33,7 @@
#include <string.h>
#include <dlfcn.h>
#include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
@@ -102,7 +102,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef boost::unordered_map< OUString, type_info *, OUStringHash > 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 ea69610..00a0125 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
@@ -33,7 +33,7 @@
#include <string.h>
#include <dlfcn.h>
#include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
@@ -102,7 +102,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef boost::unordered_map< OUString, type_info *, OUStringHash > 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 ea69610..00a0125 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
@@ -33,7 +33,7 @@
#include <string.h>
#include <dlfcn.h>
#include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
@@ -102,7 +102,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef boost::unordered_map< OUString, type_info *, OUStringHash > 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 c71cedf..5d9c3e9 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
@@ -32,7 +32,7 @@
#include <string.h>
#include <dlfcn.h>
#include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
@@ -101,7 +101,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
index 3bb910e..3290659 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
@@ -31,7 +31,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <rtl/alloc.h>
#include <osl/mutex.hxx>
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
index 3adf880..4492873 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
@@ -33,7 +33,7 @@
#include <string.h>
#include <dlfcn.h>
#include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
@@ -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 boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
index 05bbcd0..68fba9c 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
@@ -32,7 +32,7 @@
#include <stdio.h>
#include <dlfcn.h>
#include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
@@ -102,7 +102,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx
index fc0720a..a61581b 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx
@@ -32,7 +32,7 @@
#include <stdio.h>
#include <dlfcn.h>
#include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
@@ -101,7 +101,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_os2_intel/except.cxx b/bridges/source/cpp_uno/gcc3_os2_intel/except.cxx
index 20411a7..a240331 100644
--- a/bridges/source/cpp_uno/gcc3_os2_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_os2_intel/except.cxx
@@ -29,7 +29,7 @@
#include <stdio.h>
#include <dlfcn.h>
#include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
@@ -117,7 +117,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef boost::unordered_map< OUString, type_info *, OUStringHash > 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 68b2e6d..fd7089d 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
@@ -32,7 +32,7 @@
#include <stdio.h>
#include <dlfcn.h>
#include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
@@ -102,7 +102,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef boost::unordered_map< OUString, type_info *, OUStringHash > 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 6576ee4..ec09865 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
@@ -31,7 +31,7 @@
#include <stdio.h>
#include <dlfcn.h>
#include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
@@ -100,7 +100,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/mingw_intel/except.cxx b/bridges/source/cpp_uno/mingw_intel/except.cxx
index 1e83c89..c250452 100644
--- a/bridges/source/cpp_uno/mingw_intel/except.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/except.cxx
@@ -32,7 +32,7 @@
#include <stdio.h>
#include <string.h>
#include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
@@ -102,7 +102,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
//==================================================================================================
class RTTI
{
- typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+ typedef boost::unordered_map< OUString, type_info *, OUStringHash > 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 c4f1f06..054f122 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
@@ -30,7 +30,7 @@
#include "precompiled_bridges.hxx"
#pragma warning( disable : 4237 )
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <sal/config.h>
#include <malloc.h>
#include <new.h>
@@ -97,7 +97,7 @@ static inline OUString toRTTIname( OUString const & rUNOname ) throw ()
//##################################################################################################
-typedef hash_map< OUString, void *, OUStringHash, equal_to< OUString > > t_string2PtrMap;
+typedef boost::unordered_map< OUString, void *, OUStringHash, equal_to< OUString > > 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 a71591b..ac1d6cf 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
@@ -174,7 +174,7 @@ struct catchabletype
#include "precompiled_bridges.hxx"
#pragma warning( disable : 4237 )
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <sal/config.h>
#include <malloc.h>
#include <new.h>
@@ -239,7 +239,7 @@ static inline OUString toRTTIname(
//RTTI simulation
-typedef hash_map< OUString, void *, OUStringHash, equal_to< OUString > > t_string2PtrMap;
+typedef boost::unordered_map< OUString, void *, OUStringHash, equal_to< OUString > > t_string2PtrMap;
class RTTInfos
{
diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx
index 777d0da..0e3e08a 100644
--- a/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -50,7 +50,7 @@
#include "sal/types.h"
#include "typelib/typedescription.hxx"
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <new>
#include <vector>
@@ -176,7 +176,7 @@ private:
sal_Int32 calculate(
typelib_InterfaceTypeDescription * type, sal_Int32 offset);
- typedef std::hash_map< rtl::OUString, sal_Int32, rtl::OUStringHash > Map;
+ typedef boost::unordered_map< rtl::OUString, sal_Int32, rtl::OUStringHash > Map;
Map m_map;
};
diff --git a/bridges/source/jni_uno/jni_info.h b/bridges/source/jni_uno/jni_info.h
index e8cacd8..cb2926c 100644
--- a/bridges/source/jni_uno/jni_info.h
+++ b/bridges/source/jni_uno/jni_info.h
@@ -29,7 +29,7 @@
#if ! defined INCLUDED_JNI_INFO_H
#define INCLUDED_JNI_INFO_H
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include "jni_base.h"
@@ -121,7 +121,7 @@ struct JNI_type_info_holder
{}
};
-typedef ::std::hash_map<
+typedef ::boost::unordered_map<
::rtl::OUString, JNI_type_info_holder, ::rtl::OUStringHash > t_str2type;
//==============================================================================
diff --git a/bridges/source/remote/context/context.cxx b/bridges/source/remote/context/context.cxx
index 75991d4..341052c 100644
--- a/bridges/source/remote/context/context.cxx
+++ b/bridges/source/remote/context/context.cxx
@@ -31,7 +31,7 @@
#include <stdio.h>
#include <string.h>
#include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <utility>
#include <osl/diagnose.h>
@@ -98,7 +98,7 @@ struct hashOUString_Impl
{ return rName.hashCode(); }
};
-typedef hash_map
+typedef boost::unordered_map
<
OUString,
void *,
diff --git a/bridges/source/remote/urp/urp_replycontainer.hxx b/bridges/source/remote/urp/urp_replycontainer.hxx
index ff04a15..c4ba3d2 100644
--- a/bridges/source/remote/urp/urp_replycontainer.hxx
+++ b/bridges/source/remote/urp/urp_replycontainer.hxx
@@ -25,7 +25,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <list>
#include <osl/mutex.hxx>
@@ -36,7 +36,7 @@
namespace bridges_urp
{
class ClientJob;
- typedef ::std::hash_map< ::rtl::ByteSequence ,
+ typedef ::boost::unordered_map< ::rtl::ByteSequence ,
::std::list < ClientJob * > ,
HashThreadId ,
EqualThreadId > Id2ClientJobStackMap;
More information about the Libreoffice-commits
mailing list