diff options
author | Fridrich Strba <fridrich.strba@bluewin.ch> | 2011-02-03 15:22:22 -0700 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-03 23:39:38 +0100 |
commit | 4724f82bf287ad7c66403e90c303d345c6194c8a (patch) | |
tree | 12a9b838849f70c20718c347e9b1c76851ddb1f1 | |
parent | move codemaker module to the boost unordered containers (diff) | |
download | core-4724f82bf287ad7c66403e90c303d345c6194c8a.tar.gz core-4724f82bf287ad7c66403e90c303d345c6194c8a.zip |
move module cppu to boost unordered containers
-rw-r--r-- | cppu/source/LogBridge/LogBridge.cxx | 2 | ||||
-rw-r--r-- | cppu/source/threadpool/threadpool.cxx | 4 | ||||
-rw-r--r-- | cppu/source/threadpool/threadpool.hxx | 4 | ||||
-rw-r--r-- | cppu/source/typelib/typelib.cxx | 4 | ||||
-rw-r--r-- | cppu/source/uno/EnvStack.cxx | 4 | ||||
-rw-r--r-- | cppu/source/uno/lbenv.cxx | 8 | ||||
-rw-r--r-- | cppu/source/uno/lbmap.cxx | 6 |
7 files changed, 16 insertions, 16 deletions
diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx index 5ad571d3a485..8eb69cc23e4e 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 <com/sun/star/uno/Type.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <memory> namespace diff --git a/cppu/source/threadpool/threadpool.cxx b/cppu/source/threadpool/threadpool.cxx index d56999c7a74c..ec828d99fd0d 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 <hash_set> +#include <boost/unordered_map.hpp> #include <stdio.h> #include <osl/diagnose.h> @@ -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 75cdd18882d1..273798c81f8a 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 <hash_map> +#include <boost/unordered_map.hpp> #include <osl/conditn.h> @@ -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 d46960c97eb5..1ab46fdb8b22 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -33,7 +33,7 @@ #include <stdio.h> #endif -#include <hash_map> +#include <boost/unordered_map.hpp> #include <list> #include <set> #include <vector> @@ -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 330353a1e5c7..0af0aafc17ea 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 <hash_map> +#include <boost/unordered_map.hpp> using namespace com::sun::star; @@ -65,7 +65,7 @@ size_t oslThreadIdentifier_hash::operator()(oslThreadIdentifier s1) const return s1; } -typedef ::std::hash_map<oslThreadIdentifier, +typedef ::boost::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 38e5ec746112..2cd834cec65b 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -51,7 +51,7 @@ #include "destr.hxx" #include "loadmodule.hxx" -#include <hash_map> +#include <boost/unordered_map.hpp> #include <vector> #include <stdio.h> @@ -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 bfc4f5b34277..13d34554bac8 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -31,7 +31,7 @@ #include "IdentityMapping.hxx" -#include <hash_map> +#include <boost/unordered_map.hpp> #include <set> #include <algorithm> @@ -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; |