[Libreoffice-commits] core.git: connectivity/source include/comphelper sot/source ucb/source

Jaskaran jvsg1303 at gmail.com
Mon Mar 7 12:50:36 UTC 2016


 connectivity/source/drivers/postgresql/pq_connection.hxx       |    4 +---
 connectivity/source/drivers/postgresql/pq_databasemetadata.cxx |    4 +---
 include/comphelper/numberedcollection.hxx                      |    4 +---
 sot/source/sdstor/stgcache.hxx                                 |    3 +--
 ucb/source/ucp/file/filtask.hxx                                |    2 +-
 5 files changed, 5 insertions(+), 12 deletions(-)

New commits:
commit 00ecf7899a97d09ecf4a8b6d81b10e1f66903f5a
Author: Jaskaran <jvsg1303 at gmail.com>
Date:   Fri Mar 4 10:04:07 2016 +0530

    tdf#97499 Remove some Default arguments in unordered container
    
    Change-Id: Ic008e244b8ae1888fa45379371f5525ee77f6087
    Reviewed-on: https://gerrit.libreoffice.org/22887
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/connectivity/source/drivers/postgresql/pq_connection.hxx b/connectivity/source/drivers/postgresql/pq_connection.hxx
index b3610f0..1d1e35a 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 22965d1..e60043e 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 1f44fd0..48379ea 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 b9d0fab..9911f4b 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 bb37c2e..3bb6e26 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;


More information about the Libreoffice-commits mailing list