summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2015-01-05 16:08:07 +0200
committerTor Lillqvist <tml@collabora.com>2015-01-05 17:03:59 +0200
commitee75c0d0aabc934d1cad95cd4bf41a80500f546a (patch)
tree5eaa83a478ae0564ffb878d78c6156ae0360e776
parentb00f2bbf9b970115da4452ea0aab93b1c8da7b11 (diff)
Fix build error with libstdc++ 4.7 and Clang
Using std::unordered_map causes a complex multi-line error message, call to implicitly-deleted copy constructor of 'jni_uno::JNI_type_info_holder' etc. Revert ce7f442bd0b600c0acc74d4757e894a2ba382c53 for one source file. Change-Id: I24453498d3fcaadf900f2bb56a2812f8bce55dd4
-rw-r--r--bridges/source/jni_uno/jni_info.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/bridges/source/jni_uno/jni_info.h b/bridges/source/jni_uno/jni_info.h
index 1e5b4e8794c9..e38c4b3db0b0 100644
--- a/bridges/source/jni_uno/jni_info.h
+++ b/bridges/source/jni_uno/jni_info.h
@@ -23,7 +23,7 @@
#include <sal/config.h>
#include <boost/noncopyable.hpp>
-#include <unordered_map>
+#include <boost/unordered_map.hpp>
#include "jni_base.h"
@@ -114,7 +114,7 @@ struct JNI_type_info_holder: private boost::noncopyable
{}
};
-typedef std::unordered_map<
+typedef ::boost::unordered_map<
OUString, JNI_type_info_holder, OUStringHash > t_str2type;
class JNI_info: private boost::noncopyable