summaryrefslogtreecommitdiffstats
path: root/bridges/inc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-01-07 12:36:11 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-01-07 14:41:11 +0100
commit063a511583df8c2253c16ac5eb617ecf9eee7754 (patch)
tree79dcbdc4630f8be006cf5410a6f7277163f44172 /bridges/inc
parentchanged default value for long datetime, zh_CN locale data (diff)
downloadcore-063a511583df8c2253c16ac5eb617ecf9eee7754.tar.gz
core-063a511583df8c2253c16ac5eb617ecf9eee7754.zip
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/inc')
-rw-r--r--bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx4
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 1e9a48876a10..4216566b9a3e 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 <boost/unordered_map.hpp>
+#include <unordered_map>
/*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 boost::unordered_map< OUString, Vtables, OUStringHash > Map;
+ typedef std::unordered_map< OUString, Vtables, OUStringHash > Map;
osl::Mutex m_mutex;
Map m_map;