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_arm | |
| parent | fdo#84938: convert CTRL_STATE_ #defines to 'enum class' (diff) | |
| download | core-3976739f2378391fa09379c48844daf0e2790f5b.tar.gz core-3976739f2378391fa09379c48844daf0e2790f5b.zip | |
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_arm')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx | 1 | ||||
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_arm/except.cxx | 6 |
2 files changed, 5 insertions, 2 deletions
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; |