diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-01-01 19:58:59 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-01-02 16:14:36 +0000 |
commit | fd1372ba8b1c3eb3c7fad6d9c623176c8071f31b (patch) | |
tree | 448f0d04f780007b3eeeb76b7c4c8c54cbfd6d9b /svl | |
parent | c48b928acab9f226ad5ad816fe773c21051431e8 (diff) |
boost::unordered_map->std::unordered_map
you can get debug stl this way
Change-Id: Ia70a3e7c7c452390e8bee34975d296c9318e4a19
Diffstat (limited to 'svl')
-rw-r--r-- | svl/inc/pch/precompiled_svl.hxx | 2 | ||||
-rw-r--r-- | svl/source/inc/poolio.hxx | 4 | ||||
-rw-r--r-- | svl/source/items/itemprop.cxx | 10 | ||||
-rw-r--r-- | svl/source/misc/sharedstringpool.cxx | 8 | ||||
-rw-r--r-- | svl/source/notify/broadcast.cxx | 1 |
5 files changed, 13 insertions, 12 deletions
diff --git a/svl/inc/pch/precompiled_svl.hxx b/svl/inc/pch/precompiled_svl.hxx index e99ee639bf59..1d0dbdf55491 100644 --- a/svl/inc/pch/precompiled_svl.hxx +++ b/svl/inc/pch/precompiled_svl.hxx @@ -23,7 +23,6 @@ #include <boost/ptr_container/ptr_vector.hpp> #include <boost/scoped_array.hpp> #include <boost/scoped_ptr.hpp> -#include <boost/unordered_map.hpp> #include <cassert> #include <cmath> #include <com/sun/star/awt/Point.hpp> @@ -162,6 +161,7 @@ #include <tools/vcompat.hxx> #include <tools/wldcrd.hxx> #include <ucbhelper/content.hxx> +#include <unordered_map> #include <unotools/bootstrap.hxx> #include <unotools/calendarwrapper.hxx> #include <unotools/charclass.hxx> diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx index bdca925f3645..a73ba0ec59cb 100644 --- a/svl/source/inc/poolio.hxx +++ b/svl/source/inc/poolio.hxx @@ -22,8 +22,8 @@ #include <svl/SfxBroadcaster.hxx> #include <boost/shared_ptr.hpp> -#include <boost/unordered_map.hpp> #include <deque> +#include <unordered_map> #include <vector> class SfxPoolItem; @@ -72,7 +72,7 @@ typedef std::deque< SfxPoolVersion_ImplPtr > SfxPoolVersionArr_Impl; struct SfxPoolItemArray_Impl: public SfxPoolItemArrayBase_Impl { typedef std::vector<sal_uInt32> FreeList; - typedef boost::unordered_map<SfxPoolItem*,sal_uInt32> Hash; + typedef std::unordered_map<SfxPoolItem*,sal_uInt32> Hash; public: /// Track list of indices into our array that contain an empty slot diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx index 53f948455687..7428925c9525 100644 --- a/svl/source/items/itemprop.cxx +++ b/svl/source/items/itemprop.cxx @@ -23,7 +23,7 @@ #include <svl/itemset.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <boost/scoped_ptr.hpp> -#include <boost/unordered_map.hpp> +#include <unordered_map> /* * UNO III Implementation */ @@ -40,10 +40,10 @@ struct equalOUString } }; -typedef ::boost::unordered_map< OUString, - SfxItemPropertySimpleEntry, - OUStringHash, - equalOUString > SfxItemPropertyHashMap_t; +typedef std::unordered_map< OUString, + SfxItemPropertySimpleEntry, + OUStringHash, + equalOUString > SfxItemPropertyHashMap_t; class SfxItemPropertyMap_Impl : public SfxItemPropertyHashMap_t { diff --git a/svl/source/misc/sharedstringpool.cxx b/svl/source/misc/sharedstringpool.cxx index 6d0e80083e6e..e1dfe94453fd 100644 --- a/svl/source/misc/sharedstringpool.cxx +++ b/svl/source/misc/sharedstringpool.cxx @@ -12,8 +12,8 @@ #include <unotools/charclass.hxx> #include <osl/mutex.hxx> -#include <boost/unordered_map.hpp> -#include <boost/unordered_set.hpp> +#include <unordered_map> +#include <unordered_set> namespace svl { @@ -24,9 +24,9 @@ inline sal_Int32 getRefCount( const rtl_uString* p ) return (p->refCount & 0x3FFFFFFF); } -typedef boost::unordered_set<OUString, OUStringHash> StrHashType; +typedef std::unordered_set<OUString, OUStringHash> StrHashType; typedef std::pair<StrHashType::iterator, bool> InsertResultType; -typedef boost::unordered_map<const rtl_uString*, OUString> StrStoreType; +typedef std::unordered_map<const rtl_uString*, OUString> StrStoreType; InsertResultType findOrInsert( StrHashType& rPool, const OUString& rStr ) { diff --git a/svl/source/notify/broadcast.cxx b/svl/source/notify/broadcast.cxx index 8399a79d40a5..b7415ad39006 100644 --- a/svl/source/notify/broadcast.cxx +++ b/svl/source/notify/broadcast.cxx @@ -20,6 +20,7 @@ #include <svl/broadcast.hxx> #include <svl/listener.hxx> #include <svl/smplhint.hxx> +#include <algorithm> void SvtBroadcaster::Normalize() const { |