diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2021-05-01 22:13:37 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2021-05-11 12:28:24 +0200 |
| commit | eb6819e74a66750235d3a4a894479faeee8146e2 (patch) | |
| tree | c898ab63731449cf5176f35a16bacea0bb58f864 /vcl/source | |
| parent | e6c0c282be59a5198932604d6c40de837b7cb548 (diff) | |
change usage of boost::hash_combine to o3tl::hash_combine
Change-Id: I840518a36ac43d36c95f38e09c7bfcfe1a25a525
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114984
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/font/fontinstance.cxx | 7 | ||||
| -rw-r--r-- | vcl/source/gdi/gfxlink.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/graphic/BinaryDataContainer.cxx | 6 |
3 files changed, 9 insertions, 8 deletions
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 <fontinstance.hxx> #include <impfontcache.hxx> - #include <PhysicalFontFace.hxx> +#include <o3tl/hash_combine.hxx> + // 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 <vcl/gfxlink.hxx> #include <vcl/graphicfilter.hxx> #include <memory> -#include <boost/functional/hash.hpp> +#include <o3tl/hash_combine.hxx> 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 <vcl/BinaryDataContainer.hxx> -#include <boost/functional/hash.hpp> +#include <o3tl/hash_combine.hxx> BinaryDataContainer::BinaryDataContainer() = default; @@ -27,9 +27,9 @@ BinaryDataContainer::BinaryDataContainer(std::unique_ptr<std::vector<sal_uInt8>> 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; } |