Revert "boost::unordered_map->std::unordered_map"

as an experiment to see if that's somehow the cause of

NEXT    An uncaught exception of type com.sun.star.sdbc.SQLException
NEXT    - General error: java.lang.UnsatisfiedLinkError: com.sun.star.sdbcx.comp.hsqldb.StorageFileAccess.isStreamElement(Ljava/lang/String;Ljava/lang/String;)Z

NEXT    ##Failure Location unknown## : Error
        Test name: HSQLDBTest::testEmptyDBConnection
NEXT    An uncaught exception of type com.sun.star.sdbc.SQLException
NEXT    - General error: java.lang.UnsatisfiedLinkError: com.sun.star.sdbcx.comp.hsqldb.StorageFileAccess.isStreamElement(Ljava/lang/String;Ljava/lang/String;)Z

under clang

This reverts commit ce7f442bd0b600c0acc74d4757e894a2ba382c53.

Change-Id: Ieed0be5721953b9644e4be411173e0ea73f33ed8

29 files changed, 91 insertions, 48 deletions

diff --git a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
index 4216566b9a3e..1e9a48876a10 100644
--- a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
@@ -26,7 +26,7 @@
 #include "sal/types.h"
 #include "typelib/typedescription.hxx"
 
-#include <unordered_map>
+#include <boost/unordered_map.hpp>
 
 /*See: http://people.redhat.com/drepper/selinux-mem.html*/
 #if defined(LINUX) || defined(OPENBSD) || defined(FREEBSD) \
@@ -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 boost::unordered_map< OUString, Vtables, 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 2e22d92d080d..8d743571b91b 100644
--- a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
@@ -21,6 +21,7 @@
 #include <stdio.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
+#include <boost/unordered_map.hpp>
 
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -29,7 +30,7 @@
 #include <com/sun/star/uno/genfunc.hxx>
 #include <typelib/typedescription.hxx>
 #include <uno/any2.h>
-#include <unordered_map>
+
 #include "share.hxx"
 #include <string.h>
 
@@ -88,7 +89,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-    typedef std::unordered_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_ios_arm/except.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
index 8085445856f3..d20bf42435bc 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
@@ -22,6 +22,8 @@
 #include <dlfcn.h>
 
 #include <boost/static_assert.hpp>
+#include <boost/unordered_map.hpp>
+
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/mutex.hxx>
@@ -33,7 +35,7 @@
 #include <com/sun/star/ucb/NameClashException.hpp>
 #include <typelib/typedescription.hxx>
 #include <uno/any2.h>
-#include <unordered_map>
+
 #include "share.hxx"
 
 using namespace ::osl;
@@ -128,7 +130,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-    typedef std::unordered_map< OUString, std::type_info *, OUStringHash > t_rtti_map;
+    typedef boost::unordered_map< OUString, std::type_info *, OUStringHash > 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..cdfaea21ebe5 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
@@ -27,6 +27,7 @@
 #include <cxxabi.h>
 #include <dlfcn.h>
 
+#include <boost/unordered_map.hpp>
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/genfunc.h>
 #include <rtl/strbuf.hxx>
@@ -39,8 +40,8 @@
 #include <uno/mapping.h>
 
 #include <abi.hxx>
+
 #include <osl/mutex.hxx>
-#include <unordered_map>
 
 namespace {
 
@@ -81,7 +82,7 @@ public:
     std::type_info * getRtti(typelib_TypeDescription const & type);
 
 private:
-    typedef std::unordered_map<OUString, std::type_info *, OUStringHash> Map;
+    typedef boost::unordered_map<OUString, std::type_info *, OUStringHash> 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 bd7164c0dab1..ddf2c060a1e3 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
@@ -22,6 +22,8 @@
 #include <string.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
+#include <boost/unordered_map.hpp>
+
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/mutex.hxx>
@@ -29,7 +31,7 @@
 #include <com/sun/star/uno/genfunc.hxx>
 #include <typelib/typedescription.hxx>
 #include <uno/any2.h>
-#include <unordered_map>
+
 #include "share.hxx"
 
 
@@ -85,7 +87,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-    typedef std::unordered_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 0c7769748531..8bbbe03d0570 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <malloc.h>
+#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 520c49f7f884..23ebca512cc7 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
@@ -21,6 +21,8 @@
 #include <string.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
+#include <boost/unordered_map.hpp>
+
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/mutex.hxx>
@@ -30,7 +32,7 @@
 #include "com/sun/star/uno/RuntimeException.hpp"
 #include <typelib/typedescription.hxx>
 #include <uno/any2.h>
-#include <unordered_map>
+
 #include "share.hxx"
 
 
@@ -87,7 +89,7 @@ namespace CPPU_CURRENT_NAMESPACE
 
     class RTTI
     {
-        typedef std::unordered_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 c664f28c5558..95caf16f32b2 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <malloc.h>
+#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 57808f9e3dbd..f982371c8a0a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
@@ -21,6 +21,8 @@
 #include <string.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
+#include <boost/unordered_map.hpp>
+
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/mutex.hxx>
@@ -30,7 +32,7 @@
 #include "com/sun/star/uno/RuntimeException.hpp"
 #include <typelib/typedescription.hxx>
 #include <uno/any2.h>
-#include <unordered_map>
+
 #include "share.hxx"
 
 
@@ -87,7 +89,7 @@ namespace CPPU_CURRENT_NAMESPACE
 
     class RTTI
     {
-        typedef std::unordered_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 76755f85879c..7495b64fa615 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
@@ -22,6 +22,8 @@
 #include <string.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
+#include <boost/unordered_map.hpp>
+
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/mutex.hxx>
@@ -29,7 +31,7 @@
 #include <com/sun/star/uno/genfunc.hxx>
 #include <typelib/typedescription.hxx>
 #include <uno/any2.h>
-#include <unordered_map>
+
 #include "share.hxx"
 
 
@@ -85,7 +87,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-    typedef std::unordered_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 a6543c525298..47e570d41719 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
@@ -20,6 +20,7 @@
 #include <cstdio>
 #include <cstring>
 #include <dlfcn.h>
+#include <boost/unordered_map.hpp>
 
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -29,7 +30,7 @@
 #include <com/sun/star/uno/genfunc.hxx>
 #include "com/sun/star/uno/RuntimeException.hpp"
 #include <typelib/typedescription.hxx>
-#include <unordered_map>
+
 #include "share.hxx"
 
 using namespace ::std;
@@ -84,7 +85,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-    typedef std::unordered_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 18efddbc23d6..f798735dbfa1 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <malloc.h>
+#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 13a8b8f3477c..680c33a02761 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
@@ -21,6 +21,8 @@
 #include <string.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
+#include <boost/unordered_map.hpp>
+
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
@@ -30,7 +32,7 @@
 #include "com/sun/star/uno/RuntimeException.hpp"
 #include <typelib/typedescription.hxx>
 #include <uno/any2.h>
-#include <unordered_map>
+
 #include "share.hxx"
 
 
@@ -87,7 +89,7 @@ namespace CPPU_CURRENT_NAMESPACE
 
     class RTTI
     {
-        typedef std::unordered_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 419cae761915..502d94d24b94 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
@@ -20,6 +20,8 @@
 #include <string.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
+#include <boost/unordered_map.hpp>
+
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
@@ -28,7 +30,7 @@
 #include <com/sun/star/uno/genfunc.hxx>
 #include <typelib/typedescription.hxx>
 #include <uno/any2.h>
-#include <unordered_map>
+
 #include "share.hxx"
 
 
@@ -84,7 +86,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-    typedef std::unordered_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 e70a5df4eba1..fabab503508b 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
@@ -22,6 +22,7 @@
 #include <string.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
+#include <boost/unordered_map.hpp>
 
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -30,9 +31,10 @@
 #include <com/sun/star/uno/genfunc.hxx>
 #include <typelib/typedescription.hxx>
 #include <uno/any2.h>
-#include <unordered_map>
+
 #include "share.hxx"
 
+
 using namespace ::std;
 using namespace ::osl;
 using namespace ::com::sun::star::uno;
@@ -85,7 +87,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-    typedef std::unordered_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 76755f85879c..7495b64fa615 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
@@ -22,6 +22,8 @@
 #include <string.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
+#include <boost/unordered_map.hpp>
+
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/mutex.hxx>
@@ -29,7 +31,7 @@
 #include <com/sun/star/uno/genfunc.hxx>
 #include <typelib/typedescription.hxx>
 #include <uno/any2.h>
-#include <unordered_map>
+
 #include "share.hxx"
 
 
@@ -85,7 +87,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-    typedef std::unordered_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 bd7164c0dab1..ddf2c060a1e3 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
@@ -22,6 +22,8 @@
 #include <string.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
+#include <boost/unordered_map.hpp>
+
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/mutex.hxx>
@@ -29,7 +31,7 @@
 #include <com/sun/star/uno/genfunc.hxx>
 #include <typelib/typedescription.hxx>
 #include <uno/any2.h>
-#include <unordered_map>
+
 #include "share.hxx"
 
 
@@ -85,7 +87,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-    typedef std::unordered_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 abf406cdc863..92faed480720 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
@@ -22,6 +22,8 @@
 #include <string.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
+#include <boost/unordered_map.hpp>
+
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/mutex.hxx>
@@ -29,7 +31,7 @@
 #include <com/sun/star/uno/genfunc.hxx>
 #include <typelib/typedescription.hxx>
 #include <uno/any2.h>
-#include <unordered_map>
+
 #include "share.hxx"
 
 
@@ -85,7 +87,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-    typedef std::unordered_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 cb50f3536ce2..7fc8974b5334 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
@@ -21,6 +21,8 @@
 #include <string.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
+#include <boost/unordered_map.hpp>
+
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
@@ -29,7 +31,7 @@
 #include <com/sun/star/uno/genfunc.hxx>
 #include <typelib/typedescription.hxx>
 #include <uno/any2.h>
-#include <unordered_map>
+
 #include "share.hxx"
 
 
@@ -85,7 +87,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-    typedef std::unordered_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_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
index e0e76cae3f03..663a663168a6 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
@@ -20,6 +20,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <boost/unordered_map.hpp>
 
 #include <rtl/alloc.h>
 #include <osl/mutex.hxx>
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 b1e40bdf65e9..4814a2400cf0 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
@@ -28,6 +28,7 @@
 #include <dlfcn.h>
 
 #include "boost/static_assert.hpp"
+#include "boost/unordered_map.hpp"
 #include "com/sun/star/uno/RuntimeException.hpp"
 #include "com/sun/star/uno/genfunc.hxx"
 #include <sal/log.hxx>
@@ -36,7 +37,7 @@
 #include "rtl/ustrbuf.hxx"
 #include "typelib/typedescription.h"
 #include "uno/any2.h"
-#include <unordered_map>
+
 #include "share.hxx"
 
 using namespace ::osl;
@@ -143,7 +144,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-    typedef std::unordered_map< OUString, std::type_info *, OUStringHash > t_rtti_map;
+    typedef boost::unordered_map< OUString, std::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 946f105711da..153e0c31201d 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
@@ -22,6 +22,8 @@
 #include <strings.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
+#include <boost/unordered_map.hpp>
+
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
@@ -31,7 +33,7 @@
 #include "com/sun/star/uno/RuntimeException.hpp"
 #include <typelib/typedescription.hxx>
 #include <uno/any2.h>
-#include <unordered_map>
+
 #include "share.hxx"
 
 
@@ -87,7 +89,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-    typedef std::unordered_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 20a4907aa617..0973b463ca28 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
@@ -20,6 +20,8 @@
 #include <stdio.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
+#include <boost/unordered_map.hpp>
+
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
@@ -28,7 +30,7 @@
 #include <com/sun/star/uno/genfunc.hxx>
 #include <typelib/typedescription.hxx>
 #include <uno/any2.h>
-#include <unordered_map>
+
 #include "share.hxx"
 
 
@@ -84,7 +86,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-    typedef std::unordered_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 aabc8a05ad69..af50e5ca59f2 100644
--- a/bridges/source/cpp_uno/mingw_intel/except.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/except.cxx
@@ -26,6 +26,8 @@
 #define _GLIBCXX_CDTOR_CALLABI
 #endif
 
+#include <boost/unordered_map.hpp>
+
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
@@ -35,7 +37,7 @@
 #include "com/sun/star/uno/RuntimeException.hpp"
 #include <typelib/typedescription.hxx>
 #include <uno/any2.h>
-#include <unordered_map>
+
 #include "share.hxx"
 
 
@@ -91,7 +93,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-    typedef std::unordered_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_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx
index dcbf8fe5212f..b18c614353de 100644
--- a/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx
@@ -20,6 +20,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <boost/unordered_map.hpp>
 
 #include <rtl/alloc.h>
 #include <osl/mutex.hxx>
diff --git a/bridges/source/cpp_uno/mingw_x86-64/except.cxx b/bridges/source/cpp_uno/mingw_x86-64/except.cxx
index aabc8a05ad69..af50e5ca59f2 100644
--- a/bridges/source/cpp_uno/mingw_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/mingw_x86-64/except.cxx
@@ -26,6 +26,8 @@
 #define _GLIBCXX_CDTOR_CALLABI
 #endif
 
+#include <boost/unordered_map.hpp>
+
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
@@ -35,7 +37,7 @@
 #include "com/sun/star/uno/RuntimeException.hpp"
 #include <typelib/typedescription.hxx>
 #include <uno/any2.h>
-#include <unordered_map>
+
 #include "share.hxx"
 
 
@@ -91,7 +93,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-    typedef std::unordered_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 903346a0450e..57415cde2af2 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
@@ -19,6 +19,7 @@
 
 
 #pragma warning( disable : 4237 )
+#include <boost/unordered_map.hpp>
 #include <sal/config.h>
 #include <malloc.h>
 #include <typeinfo.h>
@@ -30,7 +31,7 @@
 #include <sal/log.hxx>
 
 #include "com/sun/star/uno/Any.hxx"
-#include <unordered_map>
+
 #include "msci.hxx"
 
 
@@ -81,7 +82,7 @@ static inline OUString toRTTIname( OUString const & rUNOname ) throw ()
 //#### RTTI simulation #############################################################################
 
 
-typedef std::unordered_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 28cab11777ad..d3e1e484a3ed 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
@@ -235,6 +235,7 @@ void
 
 
 #pragma warning( disable : 4237 )
+#include <boost/unordered_map.hpp>
 #include <sal/config.h>
 #include <malloc.h>
 #include <new.h>
@@ -247,7 +248,7 @@ void
 #include <sal/log.hxx>
 
 #include "com/sun/star/uno/Any.hxx"
-#include <unordered_map>
+
 #include "mscx.hxx"
 
 #pragma pack(push, 8)
@@ -301,7 +302,7 @@ static inline OUString toRTTIname(
 
 //RTTI simulation
 
-typedef std::unordered_map< OUString, void *, OUStringHash, equal_to< OUString > > t_string2PtrMap;
+typedef boost::unordered_map< OUString, void *, OUStringHash, equal_to< OUString > > 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 ca77aea72e50..2e2d74c673db 100644
--- a/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -35,8 +35,8 @@
 #include "typelib/typedescription.hxx"
 
 #include <boost/noncopyable.hpp>
+#include <boost/unordered_map.hpp>
 #include <new>
-#include <unordered_map>
 #include <vector>
 
 #if defined SAL_UNX
@@ -153,7 +153,7 @@ private:
     sal_Int32 calculate(
         typelib_InterfaceTypeDescription * type, sal_Int32 offset);
 
-    typedef std::unordered_map< OUString, sal_Int32, OUStringHash > Map;
+    typedef boost::unordered_map< OUString, sal_Int32, OUStringHash > Map;
 
     Map m_map;
 };