summaryrefslogtreecommitdiff
path: root/bridges
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-01-04 11:10:45 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-01-04 12:51:09 +0000
commitca8787a98171070c771dc167b43d5bdb98c52ce4 (patch)
tree44e476f42d84e50a406698b78f8c72b3afbdebd2 /bridges
parent18861c30a63dd419f3be47896a760109ac06c47a (diff)
boost::unordered_map->std::unordered_map
Change-Id: I5d458f43616edc395faa8c27edaddc7d515166db
Diffstat (limited to 'bridges')
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx3
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx5
2 files changed, 3 insertions, 5 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
index 1e1264356850..767a7fe9c0af 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_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>
@@ -44,8 +43,6 @@
using namespace ::osl;
using namespace ::com::sun::star::uno;
-
-
// Perform the UNO call
//
// We must convert the parameters stored in gpreg, fpreg and ovrflw to UNO
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
index b0f300d475e0..3f5292d41388 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
@@ -21,11 +21,12 @@
#include <cassert>
#include <typeinfo>
+#include <unordered_map>
#include <utility>
+#include <vector>
#include <dlfcn.h>
-#include <boost/unordered_map.hpp>
#include <osl/mutex.hxx>
#include <rtl/instance.hxx>
#include <rtl/strbuf.hxx>
@@ -39,7 +40,7 @@ namespace {
class RTTI
{
- typedef boost::unordered_map< OUString, std::type_info *, OUStringHash > t_rtti_map;
+ typedef std::unordered_map< OUString, std::type_info *, OUStringHash > t_rtti_map;
osl::Mutex m_mutex;
t_rtti_map m_rttis;