diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-01-06 09:14:10 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-01-06 09:15:14 +0000 |
| commit | 3976739f2378391fa09379c48844daf0e2790f5b (patch) | |
| tree | 9e3620b716f6d46f59d90b4d3932c329e9bc55c5 /bridges/source/cpp_uno/gcc3_linux_intel/except.cxx | |
| parent | abe670157b69aa7fe4b478f1fd13757d7b7fcc4b (diff) | |
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
Diffstat (limited to 'bridges/source/cpp_uno/gcc3_linux_intel/except.cxx')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_intel/except.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
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; |