diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2011-08-02 17:51:40 +0200 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2011-11-17 21:15:15 +0100 |
| commit | 90b5fe7673dc086d4474aae6b7f3bbc223fe7ddf (patch) | |
| tree | fef39df9106ce062cfea914ef969494ef94faea4 /connectivity/source | |
| parent | d648eecd0f63792bf8ceae1aef20100cf70bf5ea (diff) | |
Use unordered_map instead of hash_map
GNU g++ 4.6 warns that hash_map is deprecated
Diffstat (limited to 'connectivity/source')
5 files changed, 9 insertions, 9 deletions
diff --git a/connectivity/source/drivers/postgresql/pq_connection.hxx b/connectivity/source/drivers/postgresql/pq_connection.hxx index 322e3752852e..2bc15e89dd02 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.hxx +++ b/connectivity/source/drivers/postgresql/pq_connection.hxx @@ -61,7 +61,7 @@ #ifndef _PQ_CONNECTION_HXX_ #define _PQ_CONNECTION_HXX_ -#include <hash_map> +#include <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::unordered_map< ::rtl::ByteSequence, ::com::sun::star::uno::WeakReference< com::sun::star::sdbc::XCloseable >, HashByteSequence, @@ -179,7 +179,7 @@ typedef ::std::vector< rtl::OString, Allocator< ::rtl::OString > > OStringVector -typedef std::hash_map +typedef std::unordered_map < const sal_Int32, rtl::OUString, diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx index 1a260aa8bea2..f9aad4734605 100644 --- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx @@ -1107,7 +1107,7 @@ struct DatabaseTypeDescription OUString typeType; }; -typedef std::hash_map +typedef std::unordered_map < sal_Int32, DatabaseTypeDescription, diff --git a/connectivity/source/drivers/postgresql/pq_statics.hxx b/connectivity/source/drivers/postgresql/pq_statics.hxx index 5b06a8287e8a..6396a44fba4c 100644 --- a/connectivity/source/drivers/postgresql/pq_statics.hxx +++ b/connectivity/source/drivers/postgresql/pq_statics.hxx @@ -61,7 +61,7 @@ #ifndef _PQ_STATICS_HXX_ #define _PQ_STATICS_HXX_ -#include <hash_map> +#include <unordered_map> #include <vector> #include <rtl/uuid.h> @@ -131,7 +131,7 @@ struct TypeDetails sal_Bool isSearchable; }; -typedef ::std::hash_map +typedef ::std::unordered_map < rtl::OUString, sal_Int32, diff --git a/connectivity/source/drivers/postgresql/pq_tools.hxx b/connectivity/source/drivers/postgresql/pq_tools.hxx index 4ea1002f6b2f..7fbd0ad6e68d 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.hxx +++ b/connectivity/source/drivers/postgresql/pq_tools.hxx @@ -154,7 +154,7 @@ com::sun::star::uno::Sequence< sal_Int32 > string2intarray( const ::rtl::OUStrin 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::unordered_map < ::rtl::OString, ::rtl::OString, diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx index 8aaffde4996f..60be2db1aa22 100644 --- a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx +++ b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx @@ -61,7 +61,7 @@ #ifndef _PQ_CONTAINER_HXX_ #define _PQ_CONTAINER_HXX_ -#include <hash_map> +#include <unordered_map> #include <vector> #include <com/sun/star/container/XNameAccess.hpp> @@ -111,7 +111,7 @@ public: } }; -typedef ::std::hash_map +typedef ::std::unordered_map < rtl::OUString, sal_Int32, |