diff options
author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-05 18:49:26 +0100 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-06 01:00:47 +0100 |
commit | 3ca828cc9048205d0a93a1e03ba22ea3ea8ca4f1 (patch) | |
tree | b9940ac677d5aa24d4506529d9e0bdddd18561c9 /package | |
parent | 014d3582652f4014fcf65cc3023962c7f74bf75e (diff) |
move components to boost unordered containers
Diffstat (limited to 'package')
-rw-r--r-- | package/inc/HashMaps.hxx | 8 | ||||
-rw-r--r-- | package/source/manifest/ManifestImport.hxx | 2 | ||||
-rw-r--r-- | package/source/xstor/ohierarchyholder.hxx | 4 | ||||
-rw-r--r-- | package/source/zippackage/ZipPackage.cxx | 2 | ||||
-rw-r--r-- | package/source/zippackage/ZipPackageFolderEnumeration.hxx | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/package/inc/HashMaps.hxx b/package/inc/HashMaps.hxx index 637f56a13..5ec543e1c 100644 --- a/package/inc/HashMaps.hxx +++ b/package/inc/HashMaps.hxx @@ -30,7 +30,7 @@ #include <ZipEntry.hxx> #include <rtl/ref.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> struct eqFunc { @@ -46,17 +46,17 @@ namespace com { namespace sun { namespace star { namespace packages { class ContentInfo; } } } } -typedef std::hash_map < rtl::OUString, +typedef boost::unordered_map < rtl::OUString, ZipPackageFolder *, ::rtl::OUStringHash, eqFunc > FolderHash; -typedef std::hash_map < rtl::OUString, +typedef boost::unordered_map < rtl::OUString, rtl::Reference < com::sun::star::packages::ContentInfo >, ::rtl::OUStringHash, eqFunc > ContentHash; -typedef std::hash_map < rtl::OUString, +typedef boost::unordered_map < rtl::OUString, ZipEntry, rtl::OUStringHash, eqFunc > EntryHash; diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx index 6a48672bc..9655e712b 100644 --- a/package/source/manifest/ManifestImport.hxx +++ b/package/source/manifest/ManifestImport.hxx @@ -40,7 +40,7 @@ namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } -typedef ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash, eqFunc > StringHashMap; +typedef ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash, eqFunc > StringHashMap; struct ManifestScopeEntry { diff --git a/package/source/xstor/ohierarchyholder.hxx b/package/source/xstor/ohierarchyholder.hxx index 6fff34c17..1b54497da 100644 --- a/package/source/xstor/ohierarchyholder.hxx +++ b/package/source/xstor/ohierarchyholder.hxx @@ -36,7 +36,7 @@ #include <rtl/ref.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <list> #include <vector> @@ -50,7 +50,7 @@ struct eqFunc return r1 == r2; } }; -typedef ::std::hash_map< ::rtl::OUString, +typedef ::boost::unordered_map< ::rtl::OUString, ::rtl::Reference< OHierarchyElement_Impl >, ::rtl::OUStringHash, eqFunc > OHierarchyElementList_Impl; diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index 5e2b00cec..39ddc8096 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -208,7 +208,7 @@ ZipPackage::~ZipPackage( void ) #if 0 // As all folders and streams contain references to their parents, // we must remove these references so that they will be deleted when - // the hash_map of the root folder is cleared, releasing all subfolders + // the boost::unordered_map of the root folder is cleared, releasing all subfolders // and substreams which in turn release theirs, etc. When m_xRootFolder is // released when this destructor completes, the folder tree should be // deleted fully (and automagically). diff --git a/package/source/zippackage/ZipPackageFolderEnumeration.hxx b/package/source/zippackage/ZipPackageFolderEnumeration.hxx index 751ffbfb4..58e4324b3 100644 --- a/package/source/zippackage/ZipPackageFolderEnumeration.hxx +++ b/package/source/zippackage/ZipPackageFolderEnumeration.hxx @@ -43,7 +43,7 @@ protected: ContentHash& rContents; ContentHash::const_iterator aIterator; public: - //ZipPackageFolderEnumeration (std::hash_map < rtl::OUString, com::sun::star::uno::Reference < com::sun::star::container::XNamed >, hashFunc, eqFunc > &rInput); + //ZipPackageFolderEnumeration (boost::unordered_map < rtl::OUString, com::sun::star::uno::Reference < com::sun::star::container::XNamed >, hashFunc, eqFunc > &rInput); ZipPackageFolderEnumeration (ContentHash &rInput); virtual ~ZipPackageFolderEnumeration( void ); |