diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-01-07 12:36:11 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-01-07 14:41:11 +0100 |
| commit | 063a511583df8c2253c16ac5eb617ecf9eee7754 (patch) | |
| tree | 79dcbdc4630f8be006cf5410a6f7277163f44172 /bridges/source/cpp_uno/mingw_x86-64 | |
| parent | de1e4ec8fe8b101aa5e2b65a3a093588e7c57366 (diff) | |
Revert "Revert "boost::unordered_map->std::unordered_map""
This reverts commit 3976739f2378391fa09379c48844daf0e2790f5b,
the problem mentioned there was caused by a different commit, and
has meanwhile been fixed.
Diffstat (limited to 'bridges/source/cpp_uno/mingw_x86-64')
| -rw-r--r-- | bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx | 1 | ||||
| -rw-r--r-- | bridges/source/cpp_uno/mingw_x86-64/except.cxx | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx index b18c614353de..dcbf8fe5212f 100644 --- a/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx @@ -20,7 +20,6 @@ #include <stdio.h> #include <stdlib.h> -#include <boost/unordered_map.hpp> #include <rtl/alloc.h> #include <osl/mutex.hxx> diff --git a/bridges/source/cpp_uno/mingw_x86-64/except.cxx b/bridges/source/cpp_uno/mingw_x86-64/except.cxx index af50e5ca59f2..aabc8a05ad69 100644 --- a/bridges/source/cpp_uno/mingw_x86-64/except.cxx +++ b/bridges/source/cpp_uno/mingw_x86-64/except.cxx @@ -26,8 +26,6 @@ #define _GLIBCXX_CDTOR_CALLABI #endif -#include <boost/unordered_map.hpp> - #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> @@ -37,7 +35,7 @@ #include "com/sun/star/uno/RuntimeException.hpp" #include <typelib/typedescription.hxx> #include <uno/any2.h> - +#include <unordered_map> #include "share.hxx" @@ -93,7 +91,7 @@ static OUString toUNOname( char const * p ) class RTTI { - typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; + typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; Mutex m_mutex; t_rtti_map m_rttis; |