File 807-sdbc-postgresql-obsolete-hash-map.diff of Package libreoffice-branding-upstream.import5253

--- connectivity/source/drivers/postgresql/pq_connection.hxx.old	2011-08-16 12:26:22.000000000 +0200
+++ connectivity/source/drivers/postgresql/pq_connection.hxx	2011-08-16 16:39:55.000000000 +0200
@@ -61,7 +61,7 @@
 
 #ifndef _PQ_CONNECTION_HXX_
 #define _PQ_CONNECTION_HXX_
-#include <hash_map>
+#include <tr1/unordered_map>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <com/sun/star/lang/XInitialization.hpp>
@@ -168,7 +168,7 @@ struct HashByteSequence
     }
 };
 
-typedef ::std::hash_map<
+typedef std::tr1::unordered_map<
     ::rtl::ByteSequence,
     ::com::sun::star::uno::WeakReference< com::sun::star::sdbc::XCloseable >,
     HashByteSequence,
@@ -179,11 +179,11 @@ typedef ::std::vector< rtl::OString, All
 
 
 
-typedef std::hash_map
+typedef std::tr1::unordered_map
 <
     const sal_Int32,
     rtl::OUString,
-    ::std::hash< sal_Int32 >,
+    ::std::tr1::hash< sal_Int32 >,
     ::std::equal_to< sal_Int32 >,
     Allocator< ::std::pair< sal_Int32, ::rtl::OUString > >
 > Int2StringMap;
--- connectivity/source/drivers/postgresql/pq_statics.hxx.old	2011-08-16 12:26:22.000000000 +0200
+++ connectivity/source/drivers/postgresql/pq_statics.hxx	2011-08-16 16:45:07.000000000 +0200
@@ -61,7 +61,7 @@
 #ifndef _PQ_STATICS_HXX_
 #define _PQ_STATICS_HXX_
 
-#include <hash_map>
+#include <tr1/unordered_map>
 #include <vector>
 
 #include <rtl/uuid.h>
@@ -131,7 +131,7 @@ struct TypeDetails
     sal_Bool isSearchable;
 };
 
-typedef ::std::hash_map
+typedef ::std::tr1::unordered_map
 <
    rtl::OUString,
    sal_Int32,
--- connectivity/source/drivers/postgresql/pq_xcontainer.hxx.old	2011-08-16 12:26:22.000000000 +0200
+++ connectivity/source/drivers/postgresql/pq_xcontainer.hxx	2011-08-16 16:44:56.000000000 +0200
@@ -61,7 +61,7 @@
 
 #ifndef _PQ_CONTAINER_HXX_
 #define _PQ_CONTAINER_HXX_
-#include <hash_map>
+#include <tr1/unordered_map>
 #include <vector>
 
 #include <com/sun/star/container/XNameAccess.hpp>
@@ -111,7 +111,7 @@ public:
     }
 };
 
-typedef ::std::hash_map
+typedef ::std::tr1::unordered_map
 <
    rtl::OUString,
    sal_Int32,
--- connectivity/source/drivers/postgresql/pq_tools.hxx.old	2011-08-16 12:26:22.000000000 +0200
+++ connectivity/source/drivers/postgresql/pq_tools.hxx	2011-08-16 16:46:51.000000000 +0200
@@ -154,7 +154,7 @@ com::sun::star::uno::Sequence< sal_Int32
 com::sun::star::uno::Sequence< rtl::OUString > convertMappedIntArray2StringArray(
     const Int2StringMap &map, const com::sun::star::uno::Sequence< sal_Int32> &source );
 
-typedef std::hash_map
+typedef std::tr1::unordered_map
 <
     ::rtl::OString,
     ::rtl::OString,
--- connectivity/source/drivers/postgresql/pq_databasemetadata.cxx.old	2011-08-16 12:26:22.000000000 +0200
+++ connectivity/source/drivers/postgresql/pq_databasemetadata.cxx	2011-08-16 16:50:26.000000000 +0200
@@ -1107,11 +1107,11 @@ struct DatabaseTypeDescription
     OUString typeType;
 };
 
-typedef std::hash_map
+typedef std::tr1::unordered_map
 <
     sal_Int32,
     DatabaseTypeDescription,
-    ::std::hash< sal_Int32 >,
+    ::std::tr1::hash< sal_Int32 >,
     ::std::equal_to< sal_Int32 >,
     Allocator< ::std::pair< sal_Int32, DatabaseTypeDescription > >
 > Oid2DatabaseTypeDescriptionMap;
openSUSE Build Service is sponsored by