From bb564bec137f76dfa099a1cdda3cf39367a6fe50 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Sat, 5 Feb 2011 13:18:52 +0100 Subject: migrate to use boost unordered containers --- basic/source/classes/sb.cxx | 4 ++-- basic/source/classes/sbunoobj.cxx | 6 +++--- basic/source/inc/namecont.hxx | 4 ++-- basic/source/inc/sbunoobj.hxx | 4 ++-- basic/source/inc/scriptcont.hxx | 2 +- basic/source/runtime/stdobj.cxx | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) (limited to 'basic') diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 07c429769df0..ed2de2533c6f 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -56,7 +56,7 @@ #include #include #include "errobject.hxx" -#include +#include #include #include @@ -946,7 +946,7 @@ struct ClassModuleRunInitItem {} }; -typedef std::hash_map< ::rtl::OUString, ClassModuleRunInitItem, +typedef boost::unordered_map< ::rtl::OUString, ClassModuleRunInitItem, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleInitDependencyMap; static ModuleInitDependencyMap* GpMIDMap = NULL; diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index c80bc992349f..256af0aa47af 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -94,7 +94,7 @@ using namespace cppu; #include #include -#include +#include #include #include @@ -3218,7 +3218,7 @@ void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite ) refVar->PutBool( TRUE ); } -typedef std::hash_map< ::rtl::OUString, std::vector< ::rtl::OUString >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleHash; +typedef boost::unordered_map< ::rtl::OUString, std::vector< ::rtl::OUString >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleHash; // helper wrapper function to interact with TypeProvider and @@ -3245,7 +3245,7 @@ getTypeDescriptorEnumeration( const ::rtl::OUString& sSearchRoot, return xEnum; } -typedef std::hash_map< ::rtl::OUString, Any, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > VBAConstantsHash; +typedef boost::unordered_map< ::rtl::OUString, Any, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > VBAConstantsHash; VBAConstantHelper& VBAConstantHelper::instance() diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx index 3b253952fb67..419230c1c2b6 100644 --- a/basic/source/inc/namecont.hxx +++ b/basic/source/inc/namecont.hxx @@ -29,7 +29,7 @@ #ifndef BASIC_NAMECONTAINER_HXX #define BASIC_NAMECONTAINER_HXX -#include +#include #include #include #include @@ -101,7 +101,7 @@ struct eqName_Impl } }; -typedef std::hash_map +typedef boost::unordered_map < ::rtl::OUString, sal_Int32, diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx index 011ffb9a7e02..3f00fb9e8048 100644 --- a/basic/source/inc/sbunoobj.hxx +++ b/basic/source/inc/sbunoobj.hxx @@ -42,7 +42,7 @@ #include #include #include -#include +#include class SbUnoObject: public SbxObject { @@ -321,7 +321,7 @@ public: virtual void Clear(); }; -typedef std::hash_map< ::rtl::OUString, ::com::sun::star::uno::Any, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > VBAConstantsHash; +typedef boost::unordered_map< ::rtl::OUString, ::com::sun::star::uno::Any, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > VBAConstantsHash; typedef std::vector< rtl::OUString > VBAConstantsVector; diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx index 1b68e089c451..f7f948bd0b31 100644 --- a/basic/source/inc/scriptcont.hxx +++ b/basic/source/inc/scriptcont.hxx @@ -142,7 +142,7 @@ public: }; //============================================================================ -typedef std::hash_map< ::rtl::OUString, ::com::sun::star::script::ModuleInfo, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleInfoMap; +typedef boost::unordered_map< ::rtl::OUString, ::com::sun::star::script::ModuleInfo, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleInfoMap; typedef ::cppu::ImplHelper1 < ::com::sun::star::script::vba::XVBAModuleInfo > SfxScriptLibrary_BASE; diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx index f5f54dad8515..f2f51c4406c7 100644 --- a/basic/source/runtime/stdobj.cxx +++ b/basic/source/runtime/stdobj.cxx @@ -35,7 +35,7 @@ #include #include "rtlproto.hxx" #include "sbintern.hxx" -#include +#include // Das nArgs-Feld eines Tabelleneintrags ist wie folgt verschluesselt: // Zur Zeit wird davon ausgegangen, dass Properties keine Parameter // benoetigen! @@ -82,7 +82,7 @@ struct StringHashCode class VBABlacklist { friend class VBABlackListQuery; - std::hash_map< String, bool, StringHashCode > mBlackList; + boost::unordered_map< String, bool, StringHashCode > mBlackList; VBABlacklist() { const char* list[] = { "Red" }; -- cgit