diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-19 17:18:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-23 08:15:35 +0200 |
| commit | 87a9979c8938b800aab6e35903d60d24892e7f2e (patch) | |
| tree | 6beb01f22537e63df24c023ab65d391a7bee0cf6 /xmlhelp | |
| parent | d76c4e5c9aaf8bd27ec97679bcaeba5b18aca493 (diff) | |
overload std::hash for OUString and OString
no need to explicitly specify it anymore
Change-Id: I6ad9259cce77201fdd75152533f5151aae83e9ec
Reviewed-on: https://gerrit.libreoffice.org/43567
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmlhelp')
| -rw-r--r-- | xmlhelp/source/cxxhelp/provider/databases.hxx | 20 | ||||
| -rw-r--r-- | xmlhelp/source/cxxhelp/provider/db.hxx | 4 |
2 files changed, 10 insertions, 14 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx index b72dfb3dd1ac..e5beff449e8e 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.hxx +++ b/xmlhelp/source/cxxhelp/provider/databases.hxx @@ -257,37 +257,34 @@ namespace chelp { std::vector< OUString > m_avModules; - typedef std::unordered_map< OUString,helpdatafileproxy::Hdf*,OUStringHash > DatabasesTable; + typedef std::unordered_map< OUString,helpdatafileproxy::Hdf* > DatabasesTable; DatabasesTable m_aDatabases; // Language and module dependent databases - typedef std::unordered_map< OUString,OUString,OUStringHash > LangSetTable; + typedef std::unordered_map< OUString,OUString > LangSetTable; LangSetTable m_aLangSet; // Mapping to of lang-country to lang - typedef std::unordered_map< OUString,StaticModuleInformation*,OUStringHash > ModInfoTable; + typedef std::unordered_map< OUString,StaticModuleInformation* > ModInfoTable; ModInfoTable m_aModInfo; // Module information - typedef std::unordered_map< OUString,KeywordInfo*,OUStringHash > KeywordInfoTable; + typedef std::unordered_map< OUString,KeywordInfo* > KeywordInfoTable; KeywordInfoTable m_aKeywordInfo; // Module information typedef std::unordered_map< OUString, - css::uno::Reference< css::container::XHierarchicalNameAccess >, - OUStringHash > ZipFileTable; + css::uno::Reference< css::container::XHierarchicalNameAccess > > ZipFileTable; ZipFileTable m_aZipFileTable; // No closing of an once opened jarfile typedef std::unordered_map< OUString, - css::uno::Reference< css::i18n::XCollator >, - OUStringHash > CollatorTable; + css::uno::Reference< css::i18n::XCollator > > CollatorTable; CollatorTable m_aCollatorTable; typedef std::unordered_set< - OString, - OStringHash > EmptyActiveTextSet; + OString > EmptyActiveTextSet; EmptyActiveTextSet m_aEmptyActiveTextSet; // methods @@ -310,8 +307,7 @@ namespace chelp { typedef std::unordered_map < OUString, - bool, - OUStringHash + bool > ExtensionHelpExistenceMap; diff --git a/xmlhelp/source/cxxhelp/provider/db.hxx b/xmlhelp/source/cxxhelp/provider/db.hxx index 9343280b5299..e0d7d60e9c40 100644 --- a/xmlhelp/source/cxxhelp/provider/db.hxx +++ b/xmlhelp/source/cxxhelp/provider/db.hxx @@ -46,8 +46,8 @@ namespace helpdatafileproxy { { return m_pBuffer.get(); } }; - typedef std::unordered_map< OString,std::pair<int,int>,OStringHash > StringToValPosMap; - typedef std::unordered_map< OString,OString,OStringHash > StringToDataMap; + typedef std::unordered_map< OString,std::pair<int,int> > StringToValPosMap; + typedef std::unordered_map< OString,OString > StringToDataMap; class Hdf { |