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/inc | |
| 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/inc')
| -rw-r--r-- | bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx | 4 |
1 files changed, 2 insertions, 2 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; |