diff options
author | Lionel Elie Mamane <lionel@mamane.lu> | 2011-09-06 23:13:13 +0200 |
---|---|---|
committer | Lionel Elie Mamane <lionel@mamane.lu> | 2011-11-17 21:15:27 +0100 |
commit | 969bf70f1bbe62d61fcaa87236b5d0f5e03a4a52 (patch) | |
tree | 7463ba7ebe3f6eb8d6697ead8e3fb6ea6c0ed827 /connectivity/source/drivers | |
parent | 1ed8d09f679c321870c94cc18b171a4267fd2197 (diff) |
pgsql-sdbc: switch to boost::unordered_map instead of std::unordered_map
Compatibility with non-bleeding edge C++ compilers/library environments
Diffstat (limited to 'connectivity/source/drivers')
5 files changed, 9 insertions, 24 deletions
diff --git a/connectivity/source/drivers/postgresql/pq_connection.hxx b/connectivity/source/drivers/postgresql/pq_connection.hxx index 2f762789f226..d6c6c8592162 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.hxx +++ b/connectivity/source/drivers/postgresql/pq_connection.hxx @@ -58,14 +58,11 @@ * * Contributor(s): Joerg Budischewski * - * Non-Sun changes: - * * august 2011: switch to unordered_map instead of deprecated hash_map - * ************************************************************************/ #ifndef _PQ_CONNECTION_HXX_ #define _PQ_CONNECTION_HXX_ -#include <unordered_map> +#include <boost/unordered_map.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -176,7 +173,7 @@ struct HashByteSequence } }; -typedef ::std::unordered_map< +typedef ::boost::unordered_map< ::rtl::ByteSequence, ::com::sun::star::uno::WeakReference< com::sun::star::sdbc::XCloseable >, HashByteSequence, @@ -187,7 +184,7 @@ typedef ::std::vector< rtl::OString, Allocator< ::rtl::OString > > OStringVector -typedef std::unordered_map +typedef ::boost::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 1e82646f4119..6f13d175679f 100644 --- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx @@ -58,9 +58,6 @@ * * Contributor(s): Joerg Budischewski * - * Non-Sun changes: - * * august 2011: switch to unordered_map instead of deprecated hash_map - * * august 2011: calcSearchable: actually set return value, not fresh variable. * * Portions adapted from JDBC PostgreSQL driver: * @@ -1453,7 +1450,7 @@ struct DatabaseTypeDescription OUString typeType; }; -typedef std::unordered_map +typedef ::boost::unordered_map < sal_Int32, DatabaseTypeDescription, diff --git a/connectivity/source/drivers/postgresql/pq_statics.hxx b/connectivity/source/drivers/postgresql/pq_statics.hxx index ba3db88e8076..1957bbc0049f 100644 --- a/connectivity/source/drivers/postgresql/pq_statics.hxx +++ b/connectivity/source/drivers/postgresql/pq_statics.hxx @@ -57,14 +57,11 @@ * * Contributor(s): Joerg Budischewski * - * Non-Sun changes: - * * august 2011: switch to unordered_map instead of deprecated hash_map - * ************************************************************************/ #ifndef _PQ_STATICS_HXX_ #define _PQ_STATICS_HXX_ -#include <unordered_map> +#include <boost/unordered_map.hpp> #include <vector> #include <rtl/uuid.h> @@ -134,7 +131,7 @@ struct TypeDetails sal_Bool isSearchable; }; -typedef ::std::unordered_map +typedef ::boost::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 71de5ee44164..137fa3c7577a 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.hxx +++ b/connectivity/source/drivers/postgresql/pq_tools.hxx @@ -58,9 +58,6 @@ * * Contributor(s): Joerg Budischewski * - * Non-Sun changes: - * * august 2011: switch to unordered_map instead of deprecated hash_map - * ************************************************************************/ #ifndef _PQ_TOOLS_ @@ -163,7 +160,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::unordered_map +typedef ::boost::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 c0947b5fe974..3f4c80c3a37e 100644 --- a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx +++ b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx @@ -57,14 +57,11 @@ * * Contributor(s): Joerg Budischewski * - * Non-Sun changes: - * * august 2011: switch to unordered_map instead of deprecated hash_map - * ************************************************************************/ #ifndef _PQ_CONTAINER_HXX_ #define _PQ_CONTAINER_HXX_ -#include <unordered_map> +#include <boost/unordered_map.hpp> #include <vector> #include <com/sun/star/container/XNameAccess.hpp> @@ -114,7 +111,7 @@ public: } }; -typedef ::std::unordered_map +typedef ::boost::unordered_map < rtl::OUString, sal_Int32, |