diff options
Diffstat (limited to 'connectivity/source/drivers')
10 files changed, 22 insertions, 26 deletions
diff --git a/connectivity/source/drivers/mork/MColumnAlias.hxx b/connectivity/source/drivers/mork/MColumnAlias.hxx index 25b992cc2364..f45453bfd159 100644 --- a/connectivity/source/drivers/mork/MColumnAlias.hxx +++ b/connectivity/source/drivers/mork/MColumnAlias.hxx @@ -24,8 +24,8 @@ #include <unotools/confignode.hxx> #include <osl/mutex.hxx> +#include <unordered_map> #include <vector> -#include <boost/unordered_map.hpp> namespace connectivity { @@ -50,7 +50,7 @@ namespace connectivity { } }; - typedef ::boost::unordered_map< OUString, AliasEntry, OUStringHash > AliasMap; + typedef std::unordered_map< OUString, AliasEntry, OUStringHash > AliasMap; private: AliasMap m_aAliasMap; diff --git a/connectivity/source/drivers/mork/MQueryHelper.hxx b/connectivity/source/drivers/mork/MQueryHelper.hxx index d2549c70572c..42a2c9375db1 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.hxx +++ b/connectivity/source/drivers/mork/MQueryHelper.hxx @@ -26,11 +26,9 @@ #include <osl/conditn.hxx> #include <osl/thread.hxx> #include <connectivity/FValue.hxx> - #include <boost/noncopyable.hpp> -#include <boost/unordered_map.hpp> - #include "MErrorResource.hxx" +#include <unordered_map> namespace connectivity { @@ -155,7 +153,7 @@ namespace connectivity class MQueryHelperResultEntry { private: - typedef ::boost::unordered_map< OString, OUString, OStringHash > FieldMap; + typedef std::unordered_map< OString, OUString, OStringHash > FieldMap; FieldMap m_Fields; diff --git a/connectivity/source/drivers/mozab/MColumnAlias.hxx b/connectivity/source/drivers/mozab/MColumnAlias.hxx index 5c141fbb6aae..4067fd621ca6 100644 --- a/connectivity/source/drivers/mozab/MColumnAlias.hxx +++ b/connectivity/source/drivers/mozab/MColumnAlias.hxx @@ -24,8 +24,8 @@ #include <unotools/confignode.hxx> #include <osl/mutex.hxx> +#include <unordered_map> #include <vector> -#include <boost/unordered_map.hpp> namespace connectivity { @@ -50,7 +50,7 @@ namespace connectivity { } }; - typedef ::boost::unordered_map< OUString, AliasEntry, OUStringHash > AliasMap; + typedef std::unordered_map< OUString, AliasEntry, OUStringHash > AliasMap; private: AliasMap m_aAliasMap; diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx index 9c346b00ddc4..a3429b70bc1f 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx @@ -29,8 +29,7 @@ #include <tools/diagnose_ex.h> -#include <boost/unordered_map.hpp> - +#include <unordered_map> namespace connectivity { namespace mozab { @@ -62,7 +61,7 @@ namespace connectivity { namespace mozab { } }; - typedef ::boost::unordered_map< OString, CardPropertyData, OStringHash > MapPropertiesToAttributes; + typedef std::unordered_map< OString, CardPropertyData, OStringHash > MapPropertiesToAttributes; #define DEF_CARD_ACCESS( PropertyName ) \ &nsIAbCard::Get##PropertyName, &nsIAbCard::Set##PropertyName diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx index cd725df1bd10..a492ca674a18 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx @@ -32,7 +32,7 @@ #include <osl/conditn.hxx> #include <osl/thread.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> namespace connectivity { @@ -41,7 +41,7 @@ namespace connectivity class MQueryHelperResultEntry { private: - typedef ::boost::unordered_map< OString, OUString, OStringHash > FieldMap; + typedef std::unordered_map< OString, OUString, OStringHash > FieldMap; mutable ::osl::Mutex m_aMutex; FieldMap m_Fields; diff --git a/connectivity/source/drivers/postgresql/pq_connection.hxx b/connectivity/source/drivers/postgresql/pq_connection.hxx index 4daa7a1c72f6..3d3bb132af74 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.hxx +++ b/connectivity/source/drivers/postgresql/pq_connection.hxx @@ -38,7 +38,6 @@ #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_POSTGRESQL_PQ_CONNECTION_HXX #include <config_lgpl.h> -#include <boost/unordered_map.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/script/XTypeConverter.hpp> @@ -57,8 +56,10 @@ #include <cppuhelper/weakref.hxx> #include <cppuhelper/compbase6.hxx> +#include <boost/functional/hash.hpp> #include <libpq-fe.h> +#include <unordered_map> namespace pq_sdbc_driver { @@ -145,7 +146,7 @@ struct HashByteSequence } }; -typedef ::boost::unordered_map< +typedef std::unordered_map< ::rtl::ByteSequence, ::com::sun::star::uno::WeakReference< com::sun::star::sdbc::XCloseable >, HashByteSequence, @@ -155,7 +156,7 @@ typedef ::std::vector< OString > OStringVector; -typedef ::boost::unordered_map +typedef std::unordered_map < const sal_Int32, OUString, diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx index 33c3209a4d4f..8d7695ed9ae5 100644 --- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx @@ -1413,7 +1413,7 @@ struct DatabaseTypeDescription OUString typeType; }; -typedef ::boost::unordered_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 a8890a811399..537017c0fb63 100644 --- a/connectivity/source/drivers/postgresql/pq_statics.hxx +++ b/connectivity/source/drivers/postgresql/pq_statics.hxx @@ -37,7 +37,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_POSTGRESQL_PQ_STATICS_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_POSTGRESQL_PQ_STATICS_HXX -#include <boost/unordered_map.hpp> +#include <unordered_map> #include <vector> #include <com/sun/star/uno/Any.hxx> @@ -103,7 +103,7 @@ struct TypeDetails bool isSearchable; }; -typedef ::boost::unordered_map +typedef std::unordered_map < OUString, sal_Int32, @@ -111,8 +111,6 @@ typedef ::boost::unordered_map ::std::equal_to< OUString > > BaseTypeMap; - - struct ImplementationStatics { ImplementationStatics() : diff --git a/connectivity/source/drivers/postgresql/pq_tools.hxx b/connectivity/source/drivers/postgresql/pq_tools.hxx index b3b3aebabd9e..00a385893efa 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.hxx +++ b/connectivity/source/drivers/postgresql/pq_tools.hxx @@ -123,7 +123,7 @@ com::sun::star::uno::Sequence< sal_Int32 > string2intarray( const OUString & str com::sun::star::uno::Sequence< OUString > convertMappedIntArray2StringArray( const Int2StringMap &map, const com::sun::star::uno::Sequence< sal_Int32> &source ); -typedef ::boost::unordered_map +typedef std::unordered_map < OString, OString, diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx index 6a867e280ca4..82110ff61677 100644 --- a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx +++ b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx @@ -36,9 +36,6 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_POSTGRESQL_PQ_XCONTAINER_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_POSTGRESQL_PQ_XCONTAINER_HXX -#include <boost/unordered_map.hpp> -#include <vector> - #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> @@ -52,6 +49,9 @@ #include <cppuhelper/compbase8.hxx> +#include <unordered_map> +#include <vector> + #include "pq_connection.hxx" #include "pq_statics.hxx" @@ -86,7 +86,7 @@ public: } }; -typedef ::boost::unordered_map +typedef std::unordered_map < OUString, sal_Int32, |