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 /connectivity | |
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 'connectivity')
5 files changed, 5 insertions, 11 deletions
diff --git a/connectivity/source/drivers/mork/MColumnAlias.hxx b/connectivity/source/drivers/mork/MColumnAlias.hxx index cc1d2e18727c..6ce3f3052493 100644 --- a/connectivity/source/drivers/mork/MColumnAlias.hxx +++ b/connectivity/source/drivers/mork/MColumnAlias.hxx @@ -49,7 +49,7 @@ namespace connectivity { } }; - typedef std::unordered_map< OUString, AliasEntry, OUStringHash > AliasMap; + typedef std::unordered_map< OUString, AliasEntry > AliasMap; private: AliasMap m_aAliasMap; diff --git a/connectivity/source/drivers/mork/MQueryHelper.hxx b/connectivity/source/drivers/mork/MQueryHelper.hxx index 7e469d0d7a51..9f18fdbb33e0 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.hxx +++ b/connectivity/source/drivers/mork/MQueryHelper.hxx @@ -146,7 +146,7 @@ namespace connectivity class MQueryHelperResultEntry { private: - typedef std::unordered_map< OString, OUString, OStringHash > FieldMap; + typedef std::unordered_map< OString, OUString > FieldMap; FieldMap m_Fields; diff --git a/connectivity/source/drivers/postgresql/pq_statics.hxx b/connectivity/source/drivers/postgresql/pq_statics.hxx index b79df17349f5..324889b72100 100644 --- a/connectivity/source/drivers/postgresql/pq_statics.hxx +++ b/connectivity/source/drivers/postgresql/pq_statics.hxx @@ -91,8 +91,7 @@ typedef std::vector< ColumnMetaData > ColumnMetaDataVector; typedef std::unordered_map < OUString, - sal_Int32, - OUStringHash + sal_Int32 > BaseTypeMap; struct ImplementationStatics diff --git a/connectivity/source/drivers/postgresql/pq_tools.hxx b/connectivity/source/drivers/postgresql/pq_tools.hxx index 3ae5de20b3f3..6fadbbe199fa 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.hxx +++ b/connectivity/source/drivers/postgresql/pq_tools.hxx @@ -125,11 +125,7 @@ css::uno::Sequence< sal_Int32 > string2intarray( const OUString & str ); css::uno::Sequence< OUString > convertMappedIntArray2StringArray( const Int2StringMap &map, const css::uno::Sequence< sal_Int32> &source ); -typedef std::unordered_map -< - OString, - OString, - OStringHash > String2StringMap; +typedef std::unordered_map< OString, OString > String2StringMap; OUString querySingleValue( const css::uno::Reference< css::sdbc::XConnection > &connection, diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx index 0e788d1abb05..f53b0303ae1b 100644 --- a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx +++ b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx @@ -88,8 +88,7 @@ public: typedef std::unordered_map < OUString, - sal_Int32, - OUStringHash + sal_Int32 > String2IntMap; typedef ::cppu::WeakComponentImplHelper |