Kaydet (Commit) 4724f82b authored tarafından Fridrich Strba's avatar Fridrich Strba Kaydeden (comit) Fridrich Štrba

move module cppu to boost unordered containers

üst 8554daf5
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include "rtl/logfile.hxx" #include "rtl/logfile.hxx"
#include "uno/environment.hxx" #include "uno/environment.hxx"
#include <com/sun/star/uno/Type.hxx> #include <com/sun/star/uno/Type.hxx>
#include <hash_map> #include <boost/unordered_map.hpp>
#include <memory> #include <memory>
namespace namespace
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove // MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_cppu.hxx" #include "precompiled_cppu.hxx"
#include <hash_set> #include <boost/unordered_map.hpp>
#include <stdio.h> #include <stdio.h>
#include <osl/diagnose.h> #include <osl/diagnose.h>
...@@ -405,7 +405,7 @@ struct uno_ThreadPool_Hash ...@@ -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; static ThreadpoolHashSet *g_pThreadpoolHashSet;
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
* for a copy of the LGPLv3 License. * for a copy of the LGPLv3 License.
* *
************************************************************************/ ************************************************************************/
#include <hash_map> #include <boost/unordered_map.hpp>
#include <osl/conditn.h> #include <osl/conditn.h>
...@@ -60,7 +60,7 @@ namespace cppu_threadpool { ...@@ -60,7 +60,7 @@ namespace cppu_threadpool {
} }
}; };
typedef ::std::hash_map typedef ::boost::unordered_map
< <
ByteSequence, // ThreadID ByteSequence, // ThreadID
::std::pair < JobQueue * , JobQueue * >, ::std::pair < JobQueue * , JobQueue * >,
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include <stdio.h> #include <stdio.h>
#endif #endif
#include <hash_map> #include <boost/unordered_map.hpp>
#include <list> #include <list>
#include <set> #include <set>
#include <vector> #include <vector>
...@@ -192,7 +192,7 @@ struct hashStr_Impl ...@@ -192,7 +192,7 @@ struct hashStr_Impl
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Heavy hack, the const sal_Unicode * is hold by the typedescription reference // 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; hashStr_Impl, equalStr_Impl > WeakMap_Impl;
typedef pair< void *, typelib_typedescription_Callback > CallbackEntry; typedef pair< void *, typelib_typedescription_Callback > CallbackEntry;
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include "osl/thread.h" #include "osl/thread.h"
#include "osl/mutex.hxx" #include "osl/mutex.hxx"
#include <hash_map> #include <boost/unordered_map.hpp>
using namespace com::sun::star; using namespace com::sun::star;
...@@ -65,7 +65,7 @@ size_t oslThreadIdentifier_hash::operator()(oslThreadIdentifier s1) const ...@@ -65,7 +65,7 @@ size_t oslThreadIdentifier_hash::operator()(oslThreadIdentifier s1) const
return s1; return s1;
} }
typedef ::std::hash_map<oslThreadIdentifier, typedef ::boost::unordered_map<oslThreadIdentifier,
uno_Environment *, uno_Environment *,
oslThreadIdentifier_hash, oslThreadIdentifier_hash,
oslThreadIdentifier_equal> ThreadMap; oslThreadIdentifier_equal> ThreadMap;
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
#include "destr.hxx" #include "destr.hxx"
#include "loadmodule.hxx" #include "loadmodule.hxx"
#include <hash_map> #include <boost/unordered_map.hpp>
#include <vector> #include <vector>
#include <stdio.h> #include <stdio.h>
...@@ -120,16 +120,16 @@ struct FctOUStringHash : ...@@ -120,16 +120,16 @@ struct FctOUStringHash :
}; };
// mapping from environment name to environment // mapping from environment name to environment
typedef ::std::hash_map< typedef ::boost::unordered_map<
OUString, uno_Environment *, FctOUStringHash, OUString, uno_Environment *, FctOUStringHash,
::std::equal_to< OUString > > OUString2EnvironmentMap; ::std::equal_to< OUString > > OUString2EnvironmentMap;
// mapping from ptr to object entry // mapping from ptr to object entry
typedef ::std::hash_map< typedef ::boost::unordered_map<
void *, ObjectEntry *, FctPtrHash, void *, ObjectEntry *, FctPtrHash,
::std::equal_to< void * > > Ptr2ObjectMap; ::std::equal_to< void * > > Ptr2ObjectMap;
// mapping from oid to object entry // mapping from oid to object entry
typedef ::std::hash_map< typedef ::boost::unordered_map<
OUString, ObjectEntry *, FctOUStringHash, OUString, ObjectEntry *, FctOUStringHash,
::std::equal_to< OUString > > OId2ObjectMap; ::std::equal_to< OUString > > OId2ObjectMap;
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include "IdentityMapping.hxx" #include "IdentityMapping.hxx"
#include <hash_map> #include <boost/unordered_map.hpp>
#include <set> #include <set>
#include <algorithm> #include <algorithm>
...@@ -142,9 +142,9 @@ struct FctPtrHash : public std::unary_function< uno_Mapping *, size_t > ...@@ -142,9 +142,9 @@ struct FctPtrHash : public std::unary_function< uno_Mapping *, size_t >
{ return (size_t)pKey; } { return (size_t)pKey; }
}; };
typedef hash_map< typedef boost::unordered_map<
OUString, MappingEntry *, FctOUStringHash, equal_to< OUString > > t_OUString2Entry; 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; uno_Mapping *, MappingEntry *, FctPtrHash, equal_to< uno_Mapping * > > t_Mapping2Entry;
typedef set< uno_getMappingFunc > t_CallbackSet; typedef set< uno_getMappingFunc > t_CallbackSet;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment