From eb6819e74a66750235d3a4a894479faeee8146e2 Mon Sep 17 00:00:00 2001 From: Tomaž Vajngerl Date: Sat, 1 May 2021 22:13:37 +0900 Subject: change usage of boost::hash_combine to o3tl::hash_combine MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I840518a36ac43d36c95f38e09c7bfcfe1a25a525 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114984 Tested-by: Tomaž Vajngerl Reviewed-by: Tomaž Vajngerl --- vcl/source/font/fontinstance.cxx | 7 ++++--- vcl/source/gdi/gfxlink.cxx | 4 ++-- vcl/source/graphic/BinaryDataContainer.cxx | 6 +++--- 3 files changed, 9 insertions(+), 8 deletions(-) (limited to 'vcl/source') diff --git a/vcl/source/font/fontinstance.cxx b/vcl/source/font/fontinstance.cxx index f56333f6cf8a..48e4c291c350 100644 --- a/vcl/source/font/fontinstance.cxx +++ b/vcl/source/font/fontinstance.cxx @@ -23,9 +23,10 @@ #include #include - #include +#include + // extend std namespace to add custom hash needed for LogicalFontInstance namespace std @@ -35,8 +36,8 @@ namespace std size_t operator()(const pair< sal_UCS4, FontWeight >& rData) const { std::size_t seed = 0; - boost::hash_combine(seed, rData.first); - boost::hash_combine(seed, rData.second); + o3tl::hash_combine(seed, rData.first); + o3tl::hash_combine(seed, rData.second); return seed; } }; diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx index 82b37fe4e668..cc5386039e3a 100644 --- a/vcl/source/gdi/gfxlink.cxx +++ b/vcl/source/gdi/gfxlink.cxx @@ -24,7 +24,7 @@ #include #include #include -#include +#include GfxLink::GfxLink() : meType(GfxLinkType::NONE) @@ -60,7 +60,7 @@ size_t GfxLink::GetHash() const if (!maHash) { std::size_t seed = maDataContainer.calculateHash(); - boost::hash_combine(seed, meType); + o3tl::hash_combine(seed, meType); maHash = seed; } return maHash; diff --git a/vcl/source/graphic/BinaryDataContainer.cxx b/vcl/source/graphic/BinaryDataContainer.cxx index ba7a9f597c1f..339d28d601d0 100644 --- a/vcl/source/graphic/BinaryDataContainer.cxx +++ b/vcl/source/graphic/BinaryDataContainer.cxx @@ -9,7 +9,7 @@ */ #include -#include +#include BinaryDataContainer::BinaryDataContainer() = default; @@ -27,9 +27,9 @@ BinaryDataContainer::BinaryDataContainer(std::unique_ptr> size_t BinaryDataContainer::calculateHash() const { size_t nSeed = 0; - boost::hash_combine(nSeed, getSize()); + o3tl::hash_combine(nSeed, getSize()); for (sal_uInt8 const& rByte : *mpData) - boost::hash_combine(nSeed, rByte); + o3tl::hash_combine(nSeed, rByte); return nSeed; } -- cgit