accessibility/inc/pch/precompiled_acc.hxx | 1 - basctl/inc/pch/precompiled_basctl.hxx | 1 - chart2/inc/pch/precompiled_chartcontroller.hxx | 1 - comphelper/inc/pch/precompiled_comphelper.hxx | 1 - connectivity/source/drivers/postgresql/pq_connection.hxx | 4 ++-- connectivity/source/drivers/postgresql/pq_databasemetadata.cxx | 2 +- cppcanvas/inc/pch/precompiled_cppcanvas.hxx | 1 - cui/inc/pch/precompiled_cui.hxx | 1 - dbaccess/inc/pch/precompiled_dba.hxx | 1 - dbaccess/inc/pch/precompiled_dbmm.hxx | 1 - desktop/inc/pch/precompiled_sofficeapp.hxx | 1 - editeng/inc/pch/precompiled_editeng.hxx | 1 - framework/inc/pch/precompiled_fwe.hxx | 1 - framework/inc/pch/precompiled_fwi.hxx | 1 - framework/inc/pch/precompiled_fwk.hxx | 1 - framework/inc/pch/precompiled_fwl.hxx | 1 - reportdesign/inc/pch/precompiled_rpt.hxx | 1 - reportdesign/inc/pch/precompiled_rptui.hxx | 1 - sc/inc/pch/precompiled_sc.hxx | 1 - sd/inc/pch/precompiled_sdui.hxx | 1 - sfx2/inc/pch/precompiled_sfx.hxx | 1 - slideshow/inc/pch/precompiled_slideshow.hxx | 1 - sot/source/sdstor/stgcache.hxx | 4 ++-- svtools/inc/pch/precompiled_svt.hxx | 1 - svx/inc/pch/precompiled_svxcore.hxx | 1 - sw/inc/pch/precompiled_msword.hxx | 1 - sw/inc/pch/precompiled_swui.hxx | 1 - sw/inc/pch/precompiled_vbaswobj.hxx | 1 - ucb/source/ucp/file/filtask.hxx | 4 ++-- vbahelper/inc/pch/precompiled_msforms.hxx | 1 - vcl/inc/osx/saldata.hxx | 7 +++---- vcl/source/font/fontmetric.cxx | 2 -- xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx | 1 - 33 files changed, 10 insertions(+), 40 deletions(-)
New commits: commit 98c343604dcf718b3c8ee3e38da1a50c7a0199a2 Author: Noel Grandin <[email protected]> Date: Mon Feb 1 11:56:21 2016 +0200 boost::hash->std::hash Change-Id: If4d1e4071995f07212fad958b0226d5824d168f8 Reviewed-on: https://gerrit.libreoffice.org/21989 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Noel Grandin <[email protected]> diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index 8410c6d..ffc39f1 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 7382085..490c759 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 8206c33..360fa32 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 95cf1c5..912be33 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 ef1c7e2..e5ebe0b 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 a742d4a..1503007 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 1097ef2..b695b13 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 976d284..36fa752 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 491a411..aa90cb2 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 e0c606f..54dec4a 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 a0dbbf5..c432c22 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 7945aba..ee69b6b 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 e6e0d09..ed4ba13 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 003a900..2ace091 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 022786f..2b82988 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 4f6e441..862d924 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 051c05a..adb53d9 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 e151084..0b85b67 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 505a163..ed95b2d 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 ab9d1bd..a5901f2 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 0d6ba35..3b7cecc 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 19356d9..aee384c 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 97cada2..b9d0fab 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 6953074..b2305cb 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 62bc690..fbe508e 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 34cfaa1..55efe42 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 96c8fef..bebe25e 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 9a8c1b3..4405c9f 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 a515f54..11886e0 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 341e1ee..1c66492 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 b32d67b..1ea8074 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 728d84f..7a40ce5 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 7b6487e..6b1fe47 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> _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
