diff options
author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-05 13:18:52 +0100 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-05 13:18:52 +0100 |
commit | bb564bec137f76dfa099a1cdda3cf39367a6fe50 (patch) | |
tree | e444279823cc1fc9dd07196ea8008720db49248a /desktop/source | |
parent | 5ace73b0896ce36a1ea86fb1c3cb9040f12a3e17 (diff) |
migrate to use boost unordered containers
Diffstat (limited to 'desktop/source')
11 files changed, 20 insertions, 20 deletions
diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx index d8b08747dd45..0fde60da603f 100644 --- a/desktop/source/app/dispatchwatcher.hxx +++ b/desktop/source/app/dispatchwatcher.hxx @@ -34,7 +34,7 @@ #include <com/sun/star/frame/XDispatchResultListener.hpp> #include "officeipcthread.hxx" -#include <hash_map> +#include <boost/unordered_map.hpp> #include <vector> namespace desktop @@ -56,7 +56,7 @@ struct OUStringHashCode } }; -class DispatchWatcherHashMap : public ::std::hash_map< ::rtl::OUString, sal_Int32, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > +class DispatchWatcherHashMap : public ::boost::unordered_map< ::rtl::OUString, sal_Int32, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > { public: inline void free() diff --git a/desktop/source/deployment/inc/dp_persmap.h b/desktop/source/deployment/inc/dp_persmap.h index 16392c464bf1..c078cf902ec5 100644 --- a/desktop/source/deployment/inc/dp_persmap.h +++ b/desktop/source/deployment/inc/dp_persmap.h @@ -31,14 +31,14 @@ #include "rtl/ustring.hxx" #include "db.hxx" -#include <hash_map> +#include <boost/unordered_map.hpp> using namespace berkeleydbproxy; namespace dp_misc { -typedef ::std::hash_map< +typedef ::boost::unordered_map< ::rtl::OString, ::rtl::OString, ::rtl::OStringHash > t_string2string_map; //============================================================================== diff --git a/desktop/source/deployment/manager/dp_activepackages.cxx b/desktop/source/deployment/manager/dp_activepackages.cxx index dabc1e37cf24..f220aaf40daa 100644 --- a/desktop/source/deployment/manager/dp_activepackages.cxx +++ b/desktop/source/deployment/manager/dp_activepackages.cxx @@ -41,7 +41,7 @@ #include "rtl/uri.h" #include "rtl/uri.hxx" #include "rtl/ustring.hxx" -#include <hash_map> +#include <boost/unordered_map.hpp> #include "dp_identifier.hxx" #include "dp_persmap.h" diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index 0f8498877f77..fac52892f450 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -65,7 +65,7 @@ #include "boost/bind.hpp" #include <list> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <algorithm> namespace deploy = com::sun::star::deployment; diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx index 8677f960ef91..6bb8fa6e6377 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.hxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx @@ -45,7 +45,7 @@ namespace css = ::com::sun::star; namespace dp_manager { -typedef ::std::hash_map< +typedef ::boost::unordered_map< ::rtl::OUString, ::std::vector<css::uno::Reference<css::deployment::XPackage> >, ::rtl::OUStringHash > id2extensions; diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx index 55bd259a276d..cb2f3b7f4387 100644 --- a/desktop/source/deployment/manager/dp_managerfac.cxx +++ b/desktop/source/deployment/manager/dp_managerfac.cxx @@ -55,7 +55,7 @@ class PackageManagerFactoryImpl : private MutexHolder, public t_pmfac_helper Reference<deployment::XPackageManager> m_xUserMgr; Reference<deployment::XPackageManager> m_xSharedMgr; Reference<deployment::XPackageManager> m_xBundledMgr; - typedef ::std::hash_map< + typedef ::boost::unordered_map< OUString, WeakReference<deployment::XPackageManager>, ::rtl::OUStringHash > t_string2weakref; t_string2weakref m_managers; diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index 1cda30d69297..9d3be045123c 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -55,7 +55,7 @@ #include "com/sun/star/ucb/NameClash.hpp" #include "com/sun/star/util/XMacroExpander.hpp" #include <list> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <vector> #include <memory> #include <algorithm> @@ -203,7 +203,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend bool m_unorc_modified; bool bSwitchedRdbFiles; - typedef ::std::hash_map< OUString, Reference<XInterface>, + typedef ::boost::unordered_map< OUString, Reference<XInterface>, ::rtl::OUStringHash > t_string2object; t_string2object m_backendObjects; diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx index bffdaeae1924..2c7cb4c2168d 100644 --- a/desktop/source/deployment/registry/dp_registry.cxx +++ b/desktop/source/deployment/registry/dp_registry.cxx @@ -50,9 +50,9 @@ #include "com/sun/star/util/XUpdatable.hpp" #include "com/sun/star/container/XContentEnumerationAccess.hpp" #include "com/sun/star/deployment/PackageRegistryBackend.hpp" -#include <hash_map> +#include <boost/unordered_map.hpp> #include <set> -#include <hash_set> +#include <boost/unordered_set.hpp> #include <memory> using namespace ::dp_misc; @@ -91,10 +91,10 @@ class PackageRegistryImpl : private MutexHolder, public t_helper return str1.equalsIgnoreAsciiCase( str2 ); } }; - typedef ::std::hash_map< + typedef ::boost::unordered_map< OUString, Reference<deployment::XPackageRegistry>, ci_string_hash, ci_string_equals > t_string2registry; - typedef ::std::hash_map< + typedef ::boost::unordered_map< OUString, OUString, ci_string_hash, ci_string_equals > t_string2string; typedef ::std::set< @@ -190,7 +190,7 @@ void PackageRegistryImpl::insertBackend( Reference<deployment::XPackageRegistry> const & xBackend ) { m_allBackends.insert( xBackend ); - typedef ::std::hash_set<OUString, ::rtl::OUStringHash> t_stringset; + typedef ::boost::unordered_set<OUString, ::rtl::OUStringHash> t_stringset; t_stringset ambiguousFilters; const Sequence< Reference<deployment::XPackageTypeInfo> > packageTypes( diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx index 1b05a3fae184..1af6fb0f2240 100644 --- a/desktop/source/deployment/registry/executable/dp_executable.cxx +++ b/desktop/source/deployment/registry/executable/dp_executable.cxx @@ -84,7 +84,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend }; friend class ExecutablePackageImpl; - typedef ::std::hash_map< OUString, Reference<XInterface>, + typedef ::boost::unordered_map< OUString, Reference<XInterface>, ::rtl::OUStringHash > t_string2object; // PackageRegistryBackend diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h index 4e97689e253f..984b17efae66 100644 --- a/desktop/source/deployment/registry/inc/dp_backend.h +++ b/desktop/source/deployment/registry/inc/dp_backend.h @@ -43,7 +43,7 @@ #include "com/sun/star/deployment/XPackageManager.hpp" #include "com/sun/star/deployment/InvalidRemovedParameterException.hpp" #include <memory> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <list> #include "dp_registry.hrc" @@ -283,7 +283,7 @@ class PackageRegistryBackend // XPackageManager::getDeployedPackages is called often. This results in a lot //of bindPackage calls which are costly. Therefore we keep hard references in //the map now. - typedef ::std::hash_map< + typedef ::boost::unordered_map< ::rtl::OUString, css::uno::Reference<css::deployment::XPackage>, ::rtl::OUStringHash > t_string2ref; t_string2ref m_bound; diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx index ebb7c96c620c..2d079aeb99a5 100644 --- a/desktop/source/migration/migration_impl.hxx +++ b/desktop/source/migration/migration_impl.hxx @@ -31,7 +31,7 @@ #include <vector> #include <algorithm> #include <memory> -#include <hash_map> +#include <boost/unordered_map.hpp> #include "migration.hxx" @@ -138,7 +138,7 @@ struct MigrationItem ::rtl::OUString GetPrevSibling() const { return m_sPrevSibling; } }; -typedef ::std::hash_map< ::rtl::OUString, +typedef ::boost::unordered_map< ::rtl::OUString, ::std::vector< MigrationItem >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > MigrationHashMap; |