[Libreoffice-commits] core.git: bridges/source

[Tor Lillqvist]

 bridges/source/jni_uno/jni_info.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ee75c0d0aabc934d1cad95cd4bf41a80500f546a
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Jan 5 16:08:07 2015 +0200

    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

diff --git a/bridges/source/jni_uno/jni_info.h b/bridges/source/jni_uno/jni_info.h
index 1e5b4e8..e38c4b3 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