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 /basic | |
parent | fc95782eb39cf4974ac4b3096695eeb89008937c (diff) |
boost::unordered_map -> c++11 std::unordered_map
Change-Id: I28438000c2b0a8e6ce4f5640f861f572c0cb83c8
Diffstat (limited to 'basic')
-rw-r--r-- | basic/source/classes/sb.cxx | 6 | ||||
-rw-r--r-- | basic/source/classes/sbunoobj.cxx | 4 | ||||
-rw-r--r-- | basic/source/inc/namecont.hxx | 4 | ||||
-rw-r--r-- | basic/source/inc/sbunoobj.hxx | 4 | ||||
-rw-r--r-- | basic/source/inc/scriptcont.hxx | 4 | ||||
-rw-r--r-- | basic/source/runtime/runtime.cxx | 4 | ||||
-rw-r--r-- | basic/source/runtime/stdobj.cxx | 1 |
7 files changed, 13 insertions, 14 deletions
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 4d6c9a35f662..b8933b11b9eb 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -47,7 +47,7 @@ #include <com/sun/star/util/XCloseListener.hpp> #include "errobject.hxx" #include <boost/scoped_array.hpp> -#include <boost/unordered_map.hpp> +#include <unordered_map> #include <com/sun/star/script/ModuleType.hpp> #include <com/sun/star/script/ModuleInfo.hpp> @@ -167,7 +167,7 @@ void SAL_CALL DocBasicItem::disposing( const lang::EventObject& /*rEvent*/ ) thr namespace { typedef ::rtl::Reference< DocBasicItem > DocBasicItemRef; -typedef boost::unordered_map< const StarBASIC *, DocBasicItemRef > DocBasicItemMap; +typedef std::unordered_map< const StarBASIC *, DocBasicItemRef > DocBasicItemMap; class GaDocBasicItems : public rtl::Static<DocBasicItemMap,GaDocBasicItems> {}; @@ -1177,7 +1177,7 @@ struct ClassModuleRunInitItem // Derive from unordered_map type instead of typedef // to allow forward declaration in sbmod.hxx class ModuleInitDependencyMap : public - boost::unordered_map< OUString, ClassModuleRunInitItem, + std::unordered_map< OUString, ClassModuleRunInitItem, OUStringHash, ::std::equal_to< OUString > > {}; diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 227796166367..e0309f4a0c25 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -83,7 +83,7 @@ #include <math.h> #include <boost/scoped_array.hpp> -#include <boost/unordered_map.hpp> +#include <unordered_map> #include <com/sun/star/reflection/XTypeDescriptionEnumerationAccess.hpp> #include <com/sun/star/reflection/XConstantsTypeDescription.hpp> @@ -3301,7 +3301,7 @@ Reference< XTypeDescriptionEnumeration > getTypeDescriptorEnumeration( const OUS return xEnum; } -typedef boost::unordered_map< OUString, Any, OUStringHash, ::std::equal_to< OUString > > VBAConstantsHash; +typedef std::unordered_map< OUString, Any, OUStringHash, ::std::equal_to< OUString > > VBAConstantsHash; VBAConstantHelper& VBAConstantHelper::instance() diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx index c1c90d355bde..2295231ed8ea 100644 --- a/basic/source/inc/namecont.hxx +++ b/basic/source/inc/namecont.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_BASIC_SOURCE_INC_NAMECONT_HXX #define INCLUDED_BASIC_SOURCE_INC_NAMECONT_HXX -#include <boost/unordered_map.hpp> +#include <unordered_map> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -70,7 +70,7 @@ typedef ::cppu::WeakImplHelper3< class NameContainer : public ::cppu::BaseMutex, public NameContainer_BASE { - typedef boost::unordered_map < OUString, sal_Int32, OUStringHash > NameContainerNameMap; + typedef std::unordered_map < OUString, sal_Int32, OUStringHash > NameContainerNameMap; NameContainerNameMap mHashMap; ::com::sun::star::uno::Sequence< OUString > mNames; diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx index 5300e2cba999..8a985d08c029 100644 --- a/basic/source/inc/sbunoobj.hxx +++ b/basic/source/inc/sbunoobj.hxx @@ -34,7 +34,7 @@ #include <com/sun/star/reflection/XServiceTypeDescription2.hpp> #include <com/sun/star/reflection/XSingletonTypeDescription.hpp> #include <rtl/ustring.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> #include <vector> #include <map> #include <boost/shared_ptr.hpp> @@ -393,7 +393,7 @@ public: virtual void Clear() SAL_OVERRIDE; }; -typedef boost::unordered_map< OUString, ::com::sun::star::uno::Any, OUStringHash, ::std::equal_to< OUString > > VBAConstantsHash; +typedef std::unordered_map< OUString, ::com::sun::star::uno::Any, OUStringHash, ::std::equal_to< OUString > > VBAConstantsHash; typedef std::vector< OUString > VBAConstantsVector; diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx index 0a331b9cf7f9..116e05cc1357 100644 --- a/basic/source/inc/scriptcont.hxx +++ b/basic/source/inc/scriptcont.hxx @@ -132,7 +132,7 @@ public: }; -typedef boost::unordered_map< OUString, ::com::sun::star::script::ModuleInfo, OUStringHash, ::std::equal_to< OUString > > ModuleInfoMap; +typedef std::unordered_map< OUString, ::com::sun::star::script::ModuleInfo, OUStringHash, ::std::equal_to< OUString > > ModuleInfoMap; typedef ::cppu::ImplHelper1< ::com::sun::star::script::vba::XVBAModuleInfo > SfxScriptLibrary_BASE; @@ -140,7 +140,7 @@ class SfxScriptLibrary : public SfxLibrary, public SfxScriptLibrary_BASE { friend class SfxScriptLibraryContainer; - typedef boost::unordered_map< OUString, ::com::sun::star::script::ModuleInfo, OUStringHash > ModuleInfoMap; + typedef std::unordered_map< OUString, ::com::sun::star::script::ModuleInfo, OUStringHash > ModuleInfoMap; bool mbLoadedSource; bool mbLoadedBinary; diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 85f35491cb1d..e05ea92551d6 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -21,7 +21,7 @@ #include <algorithm> -#include <boost/unordered_map.hpp> +#include <unordered_map> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> @@ -1792,7 +1792,7 @@ struct SbxVariablePtrHash { return reinterpret_cast<size_t>(pVar); } }; -typedef boost::unordered_map< SbxVariable*, DimAsNewRecoverItem, +typedef std::unordered_map< SbxVariable*, DimAsNewRecoverItem, SbxVariablePtrHash > DimAsNewRecoverHash; class GaDimAsNewRecoverHash : public rtl::Static<DimAsNewRecoverHash, GaDimAsNewRecoverHash> {}; diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx index 664d76c887ac..f9f0b5424c82 100644 --- a/basic/source/runtime/stdobj.cxx +++ b/basic/source/runtime/stdobj.cxx @@ -24,7 +24,6 @@ #include <sal/macros.h> #include "rtlproto.hxx" #include "sbintern.hxx" -#include <boost/unordered_map.hpp> // The nArgs-field of a table entry is encrypted as follows: // At the moment it is assumed that properties don't need any // parameters! |