diff options
33 files changed, 10 insertions, 40 deletions
diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index 8410c6d9ffc4..ffc39f145244 100644 --- a/accessibility/inc/pch/precompiled_acc.hxx +++ b/accessibility/inc/pch/precompiled_acc.hxx @@ -52,7 +52,6 @@ #include <typeinfo> #include <utility> #include <vector> -#include <boost/functional/hash.hpp> #include <boost/intrusive_ptr.hpp> #include <boost/noncopyable.hpp> #include <boost/optional.hpp> diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx index 7382085b6c7b..490c7591911a 100644 --- a/basctl/inc/pch/precompiled_basctl.hxx +++ b/basctl/inc/pch/precompiled_basctl.hxx @@ -55,7 +55,6 @@ #include <unordered_map> #include <utility> #include <vector> -#include <boost/functional/hash.hpp> #include <boost/intrusive_ptr.hpp> #include <boost/noncopyable.hpp> #include <boost/shared_array.hpp> diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx b/chart2/inc/pch/precompiled_chartcontroller.hxx index 8206c3389bdf..360fa32722b9 100644 --- a/chart2/inc/pch/precompiled_chartcontroller.hxx +++ b/chart2/inc/pch/precompiled_chartcontroller.hxx @@ -55,7 +55,6 @@ #include <utility> #include <vector> #include <boost/checked_delete.hpp> -#include <boost/functional/hash.hpp> #include <boost/intrusive_ptr.hpp> #include <boost/optional.hpp> #include <boost/shared_array.hpp> diff --git a/comphelper/inc/pch/precompiled_comphelper.hxx b/comphelper/inc/pch/precompiled_comphelper.hxx index 95cf1c51e764..912be33055e4 100644 --- a/comphelper/inc/pch/precompiled_comphelper.hxx +++ b/comphelper/inc/pch/precompiled_comphelper.hxx @@ -38,7 +38,6 @@ #include <unordered_map> #include <utility> #include <vector> -#include <boost/functional/hash.hpp> #include <boost/noncopyable.hpp> #include <boost/optional.hpp> #include <osl/conditn.hxx> diff --git a/connectivity/source/drivers/postgresql/pq_connection.hxx b/connectivity/source/drivers/postgresql/pq_connection.hxx index ef1c7e24966f..e5ebe0bc45f2 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.hxx +++ b/connectivity/source/drivers/postgresql/pq_connection.hxx @@ -56,7 +56,7 @@ #include <cppuhelper/weakref.hxx> #include <cppuhelper/compbase.hxx> -#include <boost/functional/hash.hpp> +#include <functional> #include <libpq-fe.h> #include <unordered_map> @@ -160,7 +160,7 @@ typedef std::unordered_map < sal_Int32, OUString, - ::boost::hash< sal_Int32 >, + ::std::hash< sal_Int32 >, ::std::equal_to< sal_Int32 > > Int2StringMap; diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx index a742d4aa7742..1503007c35b8 100644 --- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx @@ -1406,7 +1406,7 @@ typedef std::unordered_map < sal_Int32, DatabaseTypeDescription, - ::boost::hash< sal_Int32 >, + ::std::hash< sal_Int32 >, ::std::equal_to< sal_Int32 > > Oid2DatabaseTypeDescriptionMap; diff --git a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx b/cppcanvas/inc/pch/precompiled_cppcanvas.hxx index 1097ef285c46..b695b13eba44 100644 --- a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx +++ b/cppcanvas/inc/pch/precompiled_cppcanvas.hxx @@ -46,7 +46,6 @@ #include <type_traits> #include <utility> #include <vector> -#include <boost/functional/hash.hpp> #include <boost/intrusive_ptr.hpp> #include <boost/noncopyable.hpp> #include <boost/optional.hpp> diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index 976d2848e65c..36fa752b552a 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.hxx @@ -54,7 +54,6 @@ #include <unordered_map> #include <utility> #include <vector> -#include <boost/functional/hash.hpp> #include <boost/intrusive_ptr.hpp> #include <boost/optional.hpp> #include <boost/optional/optional.hpp> diff --git a/dbaccess/inc/pch/precompiled_dba.hxx b/dbaccess/inc/pch/precompiled_dba.hxx index 491a411a795a..aa90cb2c312a 100644 --- a/dbaccess/inc/pch/precompiled_dba.hxx +++ b/dbaccess/inc/pch/precompiled_dba.hxx @@ -50,7 +50,6 @@ #include <utility> #include <vector> #include <boost/bind.hpp> -#include <boost/functional/hash.hpp> #include <boost/intrusive_ptr.hpp> #include <boost/noncopyable.hpp> #include <boost/optional.hpp> diff --git a/dbaccess/inc/pch/precompiled_dbmm.hxx b/dbaccess/inc/pch/precompiled_dbmm.hxx index e0c606f97638..54dec4acd734 100644 --- a/dbaccess/inc/pch/precompiled_dbmm.hxx +++ b/dbaccess/inc/pch/precompiled_dbmm.hxx @@ -47,7 +47,6 @@ #include <type_traits> #include <utility> #include <vector> -#include <boost/functional/hash.hpp> #include <boost/intrusive_ptr.hpp> #include <osl/diagnose.h> #include <osl/doublecheckedlocking.h> diff --git a/desktop/inc/pch/precompiled_sofficeapp.hxx b/desktop/inc/pch/precompiled_sofficeapp.hxx index a0dbbf5bb870..c432c228fdb5 100644 --- a/desktop/inc/pch/precompiled_sofficeapp.hxx +++ b/desktop/inc/pch/precompiled_sofficeapp.hxx @@ -49,7 +49,6 @@ #include <typeinfo> #include <utility> #include <vector> -#include <boost/functional/hash.hpp> #include <boost/intrusive_ptr.hpp> #include <boost/optional.hpp> #include <osl/conditn.hxx> diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx index 7945ababe177..ee69b6b25a71 100644 --- a/editeng/inc/pch/precompiled_editeng.hxx +++ b/editeng/inc/pch/precompiled_editeng.hxx @@ -49,7 +49,6 @@ #include <unordered_map> #include <utility> #include <vector> -#include <boost/functional/hash.hpp> #include <boost/intrusive_ptr.hpp> #include <boost/shared_array.hpp> #include <osl/diagnose.h> diff --git a/framework/inc/pch/precompiled_fwe.hxx b/framework/inc/pch/precompiled_fwe.hxx index e6e0d092bf64..ed4ba1336d74 100644 --- a/framework/inc/pch/precompiled_fwe.hxx +++ b/framework/inc/pch/precompiled_fwe.hxx @@ -49,7 +49,6 @@ #include <utility> #include <vector> #include <boost/bind.hpp> -#include <boost/functional/hash.hpp> #include <boost/intrusive_ptr.hpp> #include <osl/conditn.hxx> #include <osl/diagnose.h> diff --git a/framework/inc/pch/precompiled_fwi.hxx b/framework/inc/pch/precompiled_fwi.hxx index 003a900ecfec..2ace09193c47 100644 --- a/framework/inc/pch/precompiled_fwi.hxx +++ b/framework/inc/pch/precompiled_fwi.hxx @@ -44,7 +44,6 @@ #include <type_traits> #include <utility> #include <vector> -#include <boost/functional/hash.hpp> #include <boost/intrusive_ptr.hpp> #include <osl/diagnose.h> #include <osl/endian.h> diff --git a/framework/inc/pch/precompiled_fwk.hxx b/framework/inc/pch/precompiled_fwk.hxx index 022786f5ce67..2b8298876c50 100644 --- a/framework/inc/pch/precompiled_fwk.hxx +++ b/framework/inc/pch/precompiled_fwk.hxx @@ -53,7 +53,6 @@ #include <utility> #include <vector> #include <boost/bind.hpp> -#include <boost/functional/hash.hpp> #include <boost/intrusive_ptr.hpp> #include <boost/noncopyable.hpp> #include <boost/optional.hpp> diff --git a/framework/inc/pch/precompiled_fwl.hxx b/framework/inc/pch/precompiled_fwl.hxx index 4f6e441acbef..862d9242deb7 100644 --- a/framework/inc/pch/precompiled_fwl.hxx +++ b/framework/inc/pch/precompiled_fwl.hxx @@ -58,7 +58,6 @@ #include <unordered_map> #include <utility> #include <vector> -#include <boost/functional/hash.hpp> #include <boost/intrusive_ptr.hpp> #include <boost/noncopyable.hpp> #include <osl/conditn.h> diff --git a/reportdesign/inc/pch/precompiled_rpt.hxx b/reportdesign/inc/pch/precompiled_rpt.hxx index 051c05a9d251..adb53d9445d4 100644 --- a/reportdesign/inc/pch/precompiled_rpt.hxx +++ b/reportdesign/inc/pch/precompiled_rpt.hxx @@ -54,7 +54,6 @@ #include <utility> #include <vector> #include <boost/bind.hpp> -#include <boost/functional/hash.hpp> #include <boost/intrusive_ptr.hpp> #include <boost/noncopyable.hpp> #include <boost/optional.hpp> diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx index e1510844127f..0b85b67f5b59 100644 --- a/reportdesign/inc/pch/precompiled_rptui.hxx +++ b/reportdesign/inc/pch/precompiled_rptui.hxx @@ -57,7 +57,6 @@ #include <utility> #include <vector> #include <boost/bind.hpp> -#include <boost/functional/hash.hpp> #include <boost/intrusive_ptr.hpp> #include <boost/noncopyable.hpp> #include <boost/shared_array.hpp> diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index 505a163ecdc7..ed95b2d3e7e0 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.hxx @@ -58,7 +58,6 @@ #include <vector> #include <boost/bind.hpp> #include <boost/checked_delete.hpp> -#include <boost/functional/hash.hpp> #include <boost/intrusive_ptr.hpp> #include <boost/math/special_functions/log1p.hpp> #include <boost/noncopyable.hpp> diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx index ab9d1bd4a1d7..a5901f266584 100644 --- a/sd/inc/pch/precompiled_sdui.hxx +++ b/sd/inc/pch/precompiled_sdui.hxx @@ -53,7 +53,6 @@ #include <unordered_map> #include <utility> #include <vector> -#include <boost/functional/hash.hpp> #include <boost/intrusive_ptr.hpp> #include <boost/noncopyable.hpp> #include <boost/optional.hpp> diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx index 0d6ba35618fb..3b7cecc02542 100644 --- a/sfx2/inc/pch/precompiled_sfx.hxx +++ b/sfx2/inc/pch/precompiled_sfx.hxx @@ -42,7 +42,6 @@ #include <unordered_map> #include <utility> #include <vector> -#include <boost/functional/hash.hpp> #include <boost/intrusive_ptr.hpp> #include <boost/logic/tribool.hpp> #include <boost/noncopyable.hpp> diff --git a/slideshow/inc/pch/precompiled_slideshow.hxx b/slideshow/inc/pch/precompiled_slideshow.hxx index 19356d905de5..aee384cdbe09 100644 --- a/slideshow/inc/pch/precompiled_slideshow.hxx +++ b/slideshow/inc/pch/precompiled_slideshow.hxx @@ -55,7 +55,6 @@ #include <utility> #include <vector> #include <boost/enable_shared_from_this.hpp> -#include <boost/functional/hash.hpp> #include <boost/intrusive_ptr.hpp> #include <boost/mem_fn.hpp> #include <boost/noncopyable.hpp> diff --git a/sot/source/sdstor/stgcache.hxx b/sot/source/sdstor/stgcache.hxx index 97cada204e74..b9d0fab53778 100644 --- a/sot/source/sdstor/stgcache.hxx +++ b/sot/source/sdstor/stgcache.hxx @@ -26,9 +26,9 @@ #include <tools/stream.hxx> #include <stgelem.hxx> #include <boost/noncopyable.hpp> -#include <boost/functional/hash.hpp> #include <salhelper/simplereferenceobject.hxx> #include <unordered_map> +#include <functional> class UCBStorageStream; class StgPage; @@ -40,7 +40,7 @@ class StgCache typedef std::unordered_map < sal_Int32, rtl::Reference< StgPage >, - boost::hash< sal_Int32 >, std::equal_to< sal_Int32 > + std::hash< sal_Int32 >, std::equal_to< sal_Int32 > > IndexToStgPage; typedef std::vector< rtl::Reference< StgPage > > LRUList; diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx index 6953074ac0b7..b2305cbbb1d7 100644 --- a/svtools/inc/pch/precompiled_svt.hxx +++ b/svtools/inc/pch/precompiled_svt.hxx @@ -49,7 +49,6 @@ #include <utility> #include <vector> #include <boost/dynamic_bitset.hpp> -#include <boost/functional/hash.hpp> #include <boost/intrusive_ptr.hpp> #include <boost/noncopyable.hpp> #include <boost/optional.hpp> diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx index 62bc690cfb2c..fbe508ea63bc 100644 --- a/svx/inc/pch/precompiled_svxcore.hxx +++ b/svx/inc/pch/precompiled_svxcore.hxx @@ -53,7 +53,6 @@ #include <vector> #include <boost/assign/list_of.hpp> #include <boost/bind.hpp> -#include <boost/functional/hash.hpp> #include <boost/intrusive_ptr.hpp> #include <boost/noncopyable.hpp> #include <boost/optional.hpp> diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx index 34cfaa1fc5b4..55efe423e8f8 100644 --- a/sw/inc/pch/precompiled_msword.hxx +++ b/sw/inc/pch/precompiled_msword.hxx @@ -62,7 +62,6 @@ #include <utility> #include <vector> #include <boost/bind.hpp> -#include <boost/functional/hash.hpp> #include <boost/intrusive_ptr.hpp> #include <boost/noncopyable.hpp> #include <boost/optional.hpp> diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx index 96c8fef7d98a..bebe25e5e5b9 100644 --- a/sw/inc/pch/precompiled_swui.hxx +++ b/sw/inc/pch/precompiled_swui.hxx @@ -61,7 +61,6 @@ #include <unordered_map> #include <utility> #include <vector> -#include <boost/functional/hash.hpp> #include <boost/intrusive_ptr.hpp> #include <boost/noncopyable.hpp> #include <boost/optional.hpp> diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx b/sw/inc/pch/precompiled_vbaswobj.hxx index 9a8c1b370eca..4405c9f360c0 100644 --- a/sw/inc/pch/precompiled_vbaswobj.hxx +++ b/sw/inc/pch/precompiled_vbaswobj.hxx @@ -59,7 +59,6 @@ #include <unordered_map> #include <utility> #include <vector> -#include <boost/functional/hash.hpp> #include <boost/intrusive_ptr.hpp> #include <boost/noncopyable.hpp> #include <boost/operators.hpp> diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx index a515f549a664..11886e0f7199 100644 --- a/ucb/source/ucp/file/filtask.hxx +++ b/ucb/source/ucp/file/filtask.hxx @@ -28,9 +28,9 @@ #include <com/sun/star/ucb/XProgressHandler.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/task/XInteractionRequest.hpp> -#include <boost/functional/hash.hpp> #include "filerror.hxx" #include <unordered_map> +#include <functional> namespace fileaccess { @@ -130,7 +130,7 @@ namespace fileaccess }; // end class TaskHandling - typedef std::unordered_map< sal_Int32,TaskHandling,boost::hash< sal_Int32 > > TaskMap; + typedef std::unordered_map< sal_Int32,TaskHandling,std::hash< sal_Int32 > > TaskMap; private: osl::Mutex m_aMutex; diff --git a/vbahelper/inc/pch/precompiled_msforms.hxx b/vbahelper/inc/pch/precompiled_msforms.hxx index 341e1ee751f2..1c6649250440 100644 --- a/vbahelper/inc/pch/precompiled_msforms.hxx +++ b/vbahelper/inc/pch/precompiled_msforms.hxx @@ -53,7 +53,6 @@ #include <unordered_map> #include <utility> #include <vector> -#include <boost/functional/hash.hpp> #include <boost/intrusive_ptr.hpp> #include <osl/diagnose.h> #include <osl/endian.h> diff --git a/vcl/inc/osx/saldata.hxx b/vcl/inc/osx/saldata.hxx index b32d67b737c7..1ea8074e9b38 100644 --- a/vcl/inc/osx/saldata.hxx +++ b/vcl/inc/osx/saldata.hxx @@ -33,8 +33,7 @@ #include "svdata.hxx" #include "salwtype.hxx" -#include <boost/functional/hash.hpp> - +#include <functional> #include <list> #include <map> #include <unordered_set> @@ -56,10 +55,10 @@ class SystemFontList; #define SAL_CLIPRECT_COUNT 16 class AquaSalFrame; -struct FrameHash : public boost::hash<sal_IntPtr> +struct FrameHash : public std::hash<sal_IntPtr> { size_t operator()(const AquaSalFrame* frame) const - { return boost::hash<sal_IntPtr>::operator()( reinterpret_cast<const sal_IntPtr>(frame) ); } + { return std::hash<sal_IntPtr>::operator()( reinterpret_cast<const sal_IntPtr>(frame) ); } }; #define INVALID_CURSOR_PTR reinterpret_cast<NSCursor*>(0xdeadbeef) diff --git a/vcl/source/font/fontmetric.cxx b/vcl/source/font/fontmetric.cxx index 728d84f33522..7a40ce51afe5 100644 --- a/vcl/source/font/fontmetric.cxx +++ b/vcl/source/font/fontmetric.cxx @@ -29,8 +29,6 @@ #include <set> #include <cstdio> -#include <boost/functional/hash.hpp> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::rtl; diff --git a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx index 7b6487e4dd73..6b1fe47f71a8 100644 --- a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx +++ b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx @@ -51,7 +51,6 @@ #include <typeinfo> #include <utility> #include <vector> -#include <boost/functional/hash.hpp> #include <boost/intrusive_ptr.hpp> #include <boost/optional/optional.hpp> #include <osl/diagnose.h> |