diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-12-27 21:01:22 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-12-27 23:00:45 +0000 |
| commit | 7f476fea47f06a7f8cc961dd4f6595a524346fa5 (patch) | |
| tree | 52d16713e5a2a5203b041f9ec82742617bd33b1c /include | |
| parent | fc95782eb39cf4974ac4b3096695eeb89008937c (diff) | |
boost::unordered_map -> c++11 std::unordered_map
Change-Id: I28438000c2b0a8e6ce4f5640f861f572c0cb83c8
Diffstat (limited to 'include')
| -rw-r--r-- | include/comphelper/PropertyInfoHash.hxx | 7 | ||||
| -rw-r--r-- | include/comphelper/numberedcollection.hxx | 6 | ||||
| -rw-r--r-- | include/comphelper/sequenceashashmap.hxx | 5 |
3 files changed, 9 insertions, 9 deletions
diff --git a/include/comphelper/PropertyInfoHash.hxx b/include/comphelper/PropertyInfoHash.hxx index b0c89a0b4363..365e2e4c838f 100644 --- a/include/comphelper/PropertyInfoHash.hxx +++ b/include/comphelper/PropertyInfoHash.hxx @@ -22,7 +22,8 @@ #include <rtl/ustring.hxx> #include <com/sun/star/uno/Type.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> + namespace comphelper { struct PropertyInfo @@ -43,10 +44,10 @@ namespace comphelper }; } -typedef boost::unordered_map < OUString, +typedef std::unordered_map < OUString, ::comphelper::PropertyInfo const *, OUStringHash > PropertyInfoHash; -typedef boost::unordered_map < OUString, +typedef std::unordered_map < OUString, ::comphelper::PropertyData*, OUStringHash > PropertyDataHash; #endif diff --git a/include/comphelper/numberedcollection.hxx b/include/comphelper/numberedcollection.hxx index cd0ba95a44d0..f1d6ccc3d1df 100644 --- a/include/comphelper/numberedcollection.hxx +++ b/include/comphelper/numberedcollection.hxx @@ -30,9 +30,9 @@ #include <cppuhelper/basemutex.hxx> #include <cppuhelper/weakref.hxx> #include <cppuhelper/implbase1.hxx> - +#include <boost/functional/hash.hpp> +#include <unordered_map> #include <vector> -#include <boost/unordered_map.hpp> namespace comphelper{ @@ -58,7 +58,7 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex ::sal_Int32 nNumber; }; - typedef ::boost::unordered_map< + typedef std::unordered_map< long , TNumberedItem , ::boost::hash< long > , diff --git a/include/comphelper/sequenceashashmap.hxx b/include/comphelper/sequenceashashmap.hxx index 7d9cdfdc5d20..cd90643a0b54 100644 --- a/include/comphelper/sequenceashashmap.hxx +++ b/include/comphelper/sequenceashashmap.hxx @@ -20,9 +20,8 @@ #ifndef INCLUDED_COMPHELPER_SEQUENCEASHASHMAP_HXX #define INCLUDED_COMPHELPER_SEQUENCEASHASHMAP_HXX -#include <boost/unordered_map.hpp> - #include <algorithm> +#include <unordered_map> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/NamedValue.hpp> @@ -41,7 +40,7 @@ namespace comphelper{ such name sequences very easy ... */ -struct SequenceAsHashMapBase : public ::boost::unordered_map< +struct SequenceAsHashMapBase : public std::unordered_map< OUString , ::com::sun::star::uno::Any , OUStringHash , |