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/msvc_win32_intel | |
| 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/msvc_win32_intel')
| -rw-r--r-- | bridges/source/cpp_uno/msvc_win32_intel/except.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
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 { |