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 | 7685200dc1f5c6408cda8c89eedf275ca05708fd (patch) | |
tree | 1a0a04d4debcb79ca0a540af78b65f5df56d6841 /package | |
parent | Some cppcheck cleaning (diff) | |
download | core-7685200dc1f5c6408cda8c89eedf275ca05708fd.tar.gz core-7685200dc1f5c6408cda8c89eedf275ca05708fd.zip |
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 bfd48ef000e1..0a2fb3d9b7ae 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 e875c46b8b9c..4b74d903ee76 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 cc6fb1e211d9..8a8f6a3f6ae1 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 cee866cf8d78..0b38ff60eaf9 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 ee38ad734e84..d136faa9be49 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 ); |