From 3976739f2378391fa09379c48844daf0e2790f5b Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Tue, 6 Jan 2015 09:14:10 +0000
Subject: 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
---
 bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx')

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;
-- 
cgit