[Libreoffice-commits] .: Branch 'libreoffice-3-5' - connectivity/source

[Fridrich Strba]

 connectivity/source/drivers/postgresql/pq_connection.hxx        |    2 +-
 connectivity/source/drivers/postgresql/pq_databasemetadata.cxx  |    2 +-
 connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx |    8 --------
 3 files changed, 2 insertions(+), 10 deletions(-)

New commits:
commit fbe8b005983937e35dafb47a5a146cfbf31132cb
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Dec 7 22:21:18 2011 +0100

    Fix build of pgsql connector (std::hash -> boost::hash)
    
    Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>

diff --git a/connectivity/source/drivers/postgresql/pq_connection.hxx b/connectivity/source/drivers/postgresql/pq_connection.hxx
index 2a34025..1ff8a1a 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.hxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.hxx
@@ -183,7 +183,7 @@ typedef ::boost::unordered_map
 <
     const sal_Int32,
     rtl::OUString,
-    ::std::hash< sal_Int32 >,
+    ::boost::hash< sal_Int32 >,
     ::std::equal_to< sal_Int32 >,
     Allocator< ::std::pair< sal_Int32, ::rtl::OUString > >
 > Int2StringMap;
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 28aad9c..d26b150 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -1455,7 +1455,7 @@ typedef ::boost::unordered_map
 <
     sal_Int32,
     DatabaseTypeDescription,
-    ::std::hash< sal_Int32 >,
+    ::boost::hash< sal_Int32 >,
     ::std::equal_to< sal_Int32 >,
     Allocator< ::std::pair< sal_Int32, DatabaseTypeDescription > >
 > Oid2DatabaseTypeDescriptionMap;
diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
index 82ee02c..a67ca43 100644
--- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
@@ -181,14 +181,6 @@ ResultSetMetaData::ResultSetMetaData(
     }
 }
 
-// typedef std::hash_map<
-//     Oid,
-//     rtl::OUString,
-//     std::hash< Oid >,
-//     std::equal_to< Oid >,
-//     Allocator < std::pair< Oid, rtl::OUString > > >  PqTypeMap;
-
-
 void ResultSetMetaData::checkForTypes()
 {
     if( ! m_checkedForTypes )