summaryrefslogtreecommitdiff
path: root/cppu
diff options
context:
space:
mode:
Diffstat (limited to 'cppu')
-rw-r--r--cppu/source/threadpool/threadpool.cxx4
-rw-r--r--cppu/source/threadpool/threadpool.hxx5
-rw-r--r--cppu/source/typelib/typelib.cxx4
-rw-r--r--cppu/source/uno/EnvStack.cxx5
-rw-r--r--cppu/source/uno/lbenv.cxx10
-rw-r--r--cppu/source/uno/lbmap.cxx8
6 files changed, 16 insertions, 20 deletions
diff --git a/cppu/source/threadpool/threadpool.cxx b/cppu/source/threadpool/threadpool.cxx
index f41213b0cacc..f910cba4c10e 100644
--- a/cppu/source/threadpool/threadpool.cxx
+++ b/cppu/source/threadpool/threadpool.cxx
@@ -19,8 +19,8 @@
#include "sal/config.h"
-#include <boost/unordered_map.hpp>
#include <cassert>
+#include <unordered_map>
#include <stdio.h>
#include <osl/diagnose.h>
@@ -381,7 +381,7 @@ struct uno_ThreadPool_Hash
-typedef ::boost::unordered_map< uno_ThreadPool, ThreadPoolHolder, uno_ThreadPool_Hash, uno_ThreadPool_Equal > ThreadpoolHashSet;
+typedef std::unordered_map< uno_ThreadPool, ThreadPoolHolder, uno_ThreadPool_Hash, uno_ThreadPool_Equal > ThreadpoolHashSet;
static ThreadpoolHashSet *g_pThreadpoolHashSet;
diff --git a/cppu/source/threadpool/threadpool.hxx b/cppu/source/threadpool/threadpool.hxx
index b1db7b368cc2..a6b2fbc14de1 100644
--- a/cppu/source/threadpool/threadpool.hxx
+++ b/cppu/source/threadpool/threadpool.hxx
@@ -21,8 +21,7 @@
#define INCLUDED_CPPU_SOURCE_THREADPOOL_THREADPOOL_HXX
#include <list>
-
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <osl/conditn.h>
@@ -58,7 +57,7 @@ namespace cppu_threadpool {
}
};
- typedef ::boost::unordered_map
+ typedef std::unordered_map
<
::rtl::ByteSequence, // ThreadID
::std::pair < JobQueue * , JobQueue * >,
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 9ab878cbf6c0..507b20f7a919 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -22,7 +22,7 @@
#include <stdio.h>
#endif
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <cassert>
#include <list>
#include <set>
@@ -165,7 +165,7 @@ struct hashStr_Impl
// Heavy hack, the const sal_Unicode * is hold by the typedescription reference
-typedef boost::unordered_map< const sal_Unicode *, typelib_TypeDescriptionReference *,
+typedef std::unordered_map< const sal_Unicode *, typelib_TypeDescriptionReference *,
hashStr_Impl, equalStr_Impl > WeakMap_Impl;
typedef pair< void *, typelib_typedescription_Callback > CallbackEntry;
diff --git a/cppu/source/uno/EnvStack.cxx b/cppu/source/uno/EnvStack.cxx
index f19eeb03ae37..080fa2e0726a 100644
--- a/cppu/source/uno/EnvStack.cxx
+++ b/cppu/source/uno/EnvStack.cxx
@@ -29,8 +29,7 @@
#include "osl/thread.hxx"
#include "osl/mutex.hxx"
-#include <boost/unordered_map.hpp>
-
+#include <unordered_map>
using namespace com::sun::star;
@@ -58,7 +57,7 @@ size_t oslThreadIdentifier_hash::operator()(oslThreadIdentifier s1) const
return s1;
}
-typedef ::boost::unordered_map<oslThreadIdentifier,
+typedef std::unordered_map<oslThreadIdentifier,
uno_Environment *,
oslThreadIdentifier_hash,
oslThreadIdentifier_equal> ThreadMap;
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 0d2bc0a80cd4..eb4e105b379a 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -41,7 +41,7 @@
#include "destr.hxx"
#include "loadmodule.hxx"
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <vector>
#include <stdio.h>
@@ -104,19 +104,17 @@ struct FctPtrHash :
// mapping from environment name to environment
-typedef ::boost::unordered_map<
+typedef std::unordered_map<
OUString, uno_Environment *, OUStringHash > OUString2EnvironmentMap;
// mapping from ptr to object entry
-typedef ::boost::unordered_map<
+typedef std::unordered_map<
void *, ObjectEntry *, FctPtrHash,
::std::equal_to< void * > > Ptr2ObjectMap;
// mapping from oid to object entry
-typedef ::boost::unordered_map<
+typedef std::unordered_map<
OUString, ObjectEntry *, OUStringHash > OId2ObjectMap;
-
-
struct EnvironmentsData
{
::osl::Mutex mutex;
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index 48185d231b2e..cd9db7f3238c 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -21,10 +21,10 @@
#include "IdentityMapping.hxx"
-#include <boost/unordered_map.hpp>
-#include <set>
#include <algorithm>
#include <cassert>
+#include <set>
+#include <unordered_map>
#include "rtl/ustring.hxx"
#include "rtl/ustrbuf.hxx"
@@ -127,9 +127,9 @@ struct FctPtrHash : public std::unary_function< uno_Mapping *, size_t >
{ return reinterpret_cast<size_t>(pKey); }
};
-typedef boost::unordered_map<
+typedef std::unordered_map<
OUString, MappingEntry *, OUStringHash > t_OUString2Entry;
-typedef boost::unordered_map<
+typedef std::unordered_map<
uno_Mapping *, MappingEntry *, FctPtrHash, equal_to< uno_Mapping * > > t_Mapping2Entry;
typedef set< uno_getMappingFunc > t_CallbackSet;