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 /ucb | |
parent | 5ace73b0896ce36a1ea86fb1c3cb9040f12a3e17 (diff) |
migrate to use boost unordered containers
Diffstat (limited to 'ucb')
-rw-r--r-- | ucb/source/core/ucbstore.cxx | 4 | ||||
-rw-r--r-- | ucb/source/ucp/file/filnot.hxx | 4 | ||||
-rw-r--r-- | ucb/source/ucp/file/filtask.hxx | 4 | ||||
-rw-r--r-- | ucb/source/ucp/file/shell.hxx | 8 | ||||
-rw-r--r-- | ucb/source/ucp/hierarchy/hierarchyprovider.hxx | 4 | ||||
-rw-r--r-- | ucb/source/ucp/package/pkgprovider.cxx | 4 | ||||
-rw-r--r-- | ucb/source/ucp/webdav/ContentProperties.hxx | 4 | ||||
-rw-r--r-- | ucb/source/ucp/webdav/NeonSession.cxx | 4 | ||||
-rw-r--r-- | ucb/workben/cachemap/cachemapobjectcontainer2.hxx | 7 |
9 files changed, 20 insertions, 23 deletions
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx index f2c14121e319..6acd923e9306 100644 --- a/ucb/source/core/ucbstore.cxx +++ b/ucb/source/core/ucbstore.cxx @@ -36,7 +36,7 @@ *************************************************************************/ #include <list> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include <cppuhelper/interfacecontainer.hxx> @@ -132,7 +132,7 @@ struct hashString_Impl // //========================================================================= -typedef std::hash_map +typedef boost::unordered_map < OUString, PersistentPropertySet*, diff --git a/ucb/source/ucp/file/filnot.hxx b/ucb/source/ucp/file/filnot.hxx index 1577b199e398..789455af7602 100644 --- a/ucb/source/ucp/file/filnot.hxx +++ b/ucb/source/ucp/file/filnot.hxx @@ -28,7 +28,7 @@ #ifndef _FILNOT_HXX_ #define _FILNOT_HXX_ -#include <hash_map> +#include <boost/unordered_map.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/beans/PropertyChangeEvent.hpp> @@ -93,7 +93,7 @@ namespace fileaccess { }; - typedef std::hash_map< rtl::OUString, + typedef boost::unordered_map< rtl::OUString, com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::uno::XInterface > >, hashOUString, equalOUString > ListenerMap; diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx index 38aba3bb4537..3367b60f8bc0 100644 --- a/ucb/source/ucp/file/filtask.hxx +++ b/ucb/source/ucp/file/filtask.hxx @@ -29,7 +29,7 @@ #define _FILTASK_HXX_ #endif -#include <hash_map> +#include <boost/unordered_map.hpp> #include <rtl/ustring.hxx> #include "osl/mutex.hxx" @@ -148,7 +148,7 @@ namespace fileaccess }; // end class TaskHandling - typedef std::hash_map< sal_Int32,TaskHandling,std::hash< sal_Int32 > > TaskMap; + typedef boost::unordered_map< sal_Int32,TaskHandling,std::hash< sal_Int32 > > TaskMap; private: diff --git a/ucb/source/ucp/file/shell.hxx b/ucb/source/ucp/file/shell.hxx index 742dc36ae0d5..2660fa119bfa 100644 --- a/ucb/source/ucp/file/shell.hxx +++ b/ucb/source/ucp/file/shell.hxx @@ -35,8 +35,8 @@ #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/typeprovider.hxx> #include <vector> -#include <hash_map> -#include <hash_set> +#include <boost/unordered_map.hpp> +#include <boost/unordered_set.hpp> #include <list> #include <osl/file.hxx> @@ -143,7 +143,7 @@ namespace fileaccess { } }; - typedef std::hash_set< MyProperty,hMyProperty,eMyProperty > PropertySet; + typedef boost::unordered_set< MyProperty,hMyProperty,eMyProperty > PropertySet; typedef std::list< Notifier* > NotifierList; @@ -164,7 +164,7 @@ namespace fileaccess { com::sun::star::uno::Reference< com::sun::star::beans::XPropertyAccess > xA; }; - typedef std::hash_map< UniquePath,UnqPathData,hUniquePath,eUniquePath > ContentMap; + typedef boost::unordered_map< UniquePath,UnqPathData,hUniquePath,eUniquePath > ContentMap; public: diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx index bd00a7edd126..e3c0c477512b 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx @@ -29,7 +29,7 @@ #ifndef _HIERARCHYPROVIDER_HXX #define _HIERARCHYPROVIDER_HXX -#include <hash_map> +#include <boost/unordered_map.hpp> #include <ucbhelper/providerhelper.hxx> #include <com/sun/star/lang/XInitialization.hpp> @@ -89,7 +89,7 @@ struct hashString } }; -typedef std::hash_map +typedef boost::unordered_map < rtl::OUString, // servcie specifier ConfigProviderMapEntry, diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx index 906da6c080e0..27d411233225 100644 --- a/ucb/source/ucp/package/pkgprovider.cxx +++ b/ucb/source/ucp/package/pkgprovider.cxx @@ -35,7 +35,7 @@ *************************************************************************/ -#include <hash_map> +#include <boost/unordered_map.hpp> #include <osl/diagnose.h> #include <cppuhelper/weak.hxx> #include <ucbhelper/contentidentifier.hxx> @@ -117,7 +117,7 @@ struct hashString } }; -typedef std::hash_map +typedef boost::unordered_map < rtl::OUString, Package*, diff --git a/ucb/source/ucp/webdav/ContentProperties.hxx b/ucb/source/ucp/webdav/ContentProperties.hxx index a69a214ffe25..0f58db45db86 100644 --- a/ucb/source/ucp/webdav/ContentProperties.hxx +++ b/ucb/source/ucp/webdav/ContentProperties.hxx @@ -31,7 +31,7 @@ #include <memory> #include <vector> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <rtl/ustring.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> @@ -89,7 +89,7 @@ public: }; -typedef std::hash_map +typedef boost::unordered_map < rtl::OUString, PropertyValue, diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx index 7943d8a3d540..9d3232b6e91c 100644 --- a/ucb/source/ucp/webdav/NeonSession.cxx +++ b/ucb/source/ucp/webdav/NeonSession.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_ucb.hxx" -#include <hash_map> +#include <boost/unordered_map.hpp> #include <vector> #include <string.h> #include "osl/diagnose.h" @@ -109,7 +109,7 @@ struct hashPtr } }; -typedef std::hash_map +typedef boost::unordered_map < ne_request*, RequestData, diff --git a/ucb/workben/cachemap/cachemapobjectcontainer2.hxx b/ucb/workben/cachemap/cachemapobjectcontainer2.hxx index e1d9f91b3efb..c875bb3333b7 100644 --- a/ucb/workben/cachemap/cachemapobjectcontainer2.hxx +++ b/ucb/workben/cachemap/cachemapobjectcontainer2.hxx @@ -34,10 +34,7 @@ #include "rtl/ref.hxx" #include "sal/types.h" -#ifndef INCLUDED_HASH_MAP -#include <hash_map> -#define INCLUDED_HASH_MAP -#endif +#include <boost/unordered_map.hpp> namespace rtl { class OUString; @@ -57,7 +54,7 @@ public: rtl::Reference< Object2 > get(rtl::OUString const & rKey); private: - typedef std::hash_map< rtl::OUString, + typedef boost::unordered_map< rtl::OUString, com::sun::star::uno::WeakReference< Object2 >, rtl::OUStringHash > Map; |