From d0958219679151caef2f1b27998f2004147d9c1d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 3 Feb 2011 15:22:22 -0700 Subject: move module cppu to boost unordered containers --- cppu/source/LogBridge/LogBridge.cxx | 2 +- cppu/source/threadpool/threadpool.cxx | 4 ++-- cppu/source/threadpool/threadpool.hxx | 4 ++-- cppu/source/typelib/typelib.cxx | 4 ++-- cppu/source/uno/EnvStack.cxx | 4 ++-- cppu/source/uno/lbenv.cxx | 8 ++++---- cppu/source/uno/lbmap.cxx | 6 +++--- 7 files changed, 16 insertions(+), 16 deletions(-) (limited to 'cppu') diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx index 2fbe5153a..a29014449 100644 --- a/cppu/source/LogBridge/LogBridge.cxx +++ b/cppu/source/LogBridge/LogBridge.cxx @@ -39,7 +39,7 @@ #include "rtl/logfile.hxx" #include "uno/environment.hxx" #include -#include +#include #include namespace diff --git a/cppu/source/threadpool/threadpool.cxx b/cppu/source/threadpool/threadpool.cxx index 42dd87089..cdd27766f 100644 --- a/cppu/source/threadpool/threadpool.cxx +++ b/cppu/source/threadpool/threadpool.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cppu.hxx" -#include +#include #include #include @@ -405,7 +405,7 @@ struct uno_ThreadPool_Hash -typedef ::std::hash_map< uno_ThreadPool, ThreadPoolHolder, uno_ThreadPool_Hash, uno_ThreadPool_Equal > ThreadpoolHashSet; +typedef ::boost::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 db849099e..3de924915 100644 --- a/cppu/source/threadpool/threadpool.hxx +++ b/cppu/source/threadpool/threadpool.hxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include +#include #include @@ -60,7 +60,7 @@ namespace cppu_threadpool { } }; - typedef ::std::hash_map + typedef ::boost::unordered_map < ByteSequence, // ThreadID ::std::pair < JobQueue * , JobQueue * >, diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index 4e22da6a0..488e98ff8 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -33,7 +33,7 @@ #include #endif -#include +#include #include #include #include @@ -192,7 +192,7 @@ struct hashStr_Impl //----------------------------------------------------------------------------- // Heavy hack, the const sal_Unicode * is hold by the typedescription reference -typedef hash_map< const sal_Unicode *, typelib_TypeDescriptionReference *, +typedef boost::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 99322eb0d..c96d307cd 100644 --- a/cppu/source/uno/EnvStack.cxx +++ b/cppu/source/uno/EnvStack.cxx @@ -36,7 +36,7 @@ #include "osl/thread.h" #include "osl/mutex.hxx" -#include +#include using namespace com::sun::star; @@ -65,7 +65,7 @@ size_t oslThreadIdentifier_hash::operator()(oslThreadIdentifier s1) const return s1; } -typedef ::std::hash_map ThreadMap; diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index 559991081..edadca235 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -51,7 +51,7 @@ #include "destr.hxx" #include "loadmodule.hxx" -#include +#include #include #include @@ -120,16 +120,16 @@ struct FctOUStringHash : }; // mapping from environment name to environment -typedef ::std::hash_map< +typedef ::boost::unordered_map< OUString, uno_Environment *, FctOUStringHash, ::std::equal_to< OUString > > OUString2EnvironmentMap; // mapping from ptr to object entry -typedef ::std::hash_map< +typedef ::boost::unordered_map< void *, ObjectEntry *, FctPtrHash, ::std::equal_to< void * > > Ptr2ObjectMap; // mapping from oid to object entry -typedef ::std::hash_map< +typedef ::boost::unordered_map< OUString, ObjectEntry *, FctOUStringHash, ::std::equal_to< OUString > > OId2ObjectMap; diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index 4060c72d1..a701e1a78 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -31,7 +31,7 @@ #include "IdentityMapping.hxx" -#include +#include #include #include @@ -142,9 +142,9 @@ struct FctPtrHash : public std::unary_function< uno_Mapping *, size_t > { return (size_t)pKey; } }; -typedef hash_map< +typedef boost::unordered_map< OUString, MappingEntry *, FctOUStringHash, equal_to< OUString > > t_OUString2Entry; -typedef hash_map< +typedef boost::unordered_map< uno_Mapping *, MappingEntry *, FctPtrHash, equal_to< uno_Mapping * > > t_Mapping2Entry; typedef set< uno_getMappingFunc > t_CallbackSet; -- cgit v1.2.3