summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaskaran <jvsg1303@gmail.com>2016-03-04 10:04:07 +0530
committerMichael Stahl <mstahl@redhat.com>2016-03-07 12:50:15 +0000
commit00ecf7899a97d09ecf4a8b6d81b10e1f66903f5a (patch)
tree5ea26ae38be277be80b2b7a769ad1976d9207e37
parent088ba465d6bb0931c7034d564a3077e21078cb13 (diff)
tdf#97499 Remove some Default arguments in unordered container
Change-Id: Ic008e244b8ae1888fa45379371f5525ee77f6087 Reviewed-on: https://gerrit.libreoffice.org/22887 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--connectivity/source/drivers/postgresql/pq_connection.hxx4
-rw-r--r--connectivity/source/drivers/postgresql/pq_databasemetadata.cxx4
-rw-r--r--include/comphelper/numberedcollection.hxx4
-rw-r--r--sot/source/sdstor/stgcache.hxx3
-rw-r--r--ucb/source/ucp/file/filtask.hxx2
5 files changed, 5 insertions, 12 deletions
diff --git a/connectivity/source/drivers/postgresql/pq_connection.hxx b/connectivity/source/drivers/postgresql/pq_connection.hxx
index b3610f01af0f..1d1e35a7aa3f 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.hxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.hxx
@@ -156,9 +156,7 @@ typedef ::std::vector< OString > OStringVector;
typedef std::unordered_map
<
sal_Int32,
- OUString,
- ::std::hash< sal_Int32 >,
- ::std::equal_to< sal_Int32 >
+ OUString
> Int2StringMap;
class Connection : public ConnectionBase
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 22965d12528d..e60043eff625 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -1420,9 +1420,7 @@ namespace {
typedef std::unordered_map
<
sal_Int32,
- DatabaseTypeDescription,
- ::std::hash< sal_Int32 >,
- ::std::equal_to< sal_Int32 >
+ DatabaseTypeDescription
> Oid2DatabaseTypeDescriptionMap;
static void columnMetaData2DatabaseTypeDescription(
diff --git a/include/comphelper/numberedcollection.hxx b/include/comphelper/numberedcollection.hxx
index 1f44fd0e96ea..48379eaf4435 100644
--- a/include/comphelper/numberedcollection.hxx
+++ b/include/comphelper/numberedcollection.hxx
@@ -61,9 +61,7 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex
typedef std::unordered_map<
long,
- TNumberedItem,
- ::std::hash<long>,
- ::std::equal_to< long > > TNumberedItemHash;
+ TNumberedItem > TNumberedItemHash;
typedef ::std::vector< long > TDeadItemList;
diff --git a/sot/source/sdstor/stgcache.hxx b/sot/source/sdstor/stgcache.hxx
index b9d0fab53778..9911f4b4cc7d 100644
--- a/sot/source/sdstor/stgcache.hxx
+++ b/sot/source/sdstor/stgcache.hxx
@@ -39,8 +39,7 @@ class StgCache
{
typedef std::unordered_map
<
- sal_Int32, rtl::Reference< StgPage >,
- std::hash< sal_Int32 >, std::equal_to< sal_Int32 >
+ sal_Int32, rtl::Reference< StgPage >
> IndexToStgPage;
typedef std::vector< rtl::Reference< StgPage > > LRUList;
diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx
index bb37c2e091ef..3bb6e2661aa2 100644
--- a/ucb/source/ucp/file/filtask.hxx
+++ b/ucb/source/ucp/file/filtask.hxx
@@ -128,7 +128,7 @@ namespace fileaccess
}; // end class TaskHandling
- typedef std::unordered_map< sal_Int32,TaskHandling,std::hash< sal_Int32 > > TaskMap;
+ typedef std::unordered_map< sal_Int32,TaskHandling > TaskMap;
private:
osl::Mutex m_aMutex;