generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-29 04:17:55 +01:00
Code Issues Projects Releases Wiki Activity

fix(hashRange): change function names casing

Browse Source
This commit is contained in:
Alex Fabijanic
2021-04-05 18:04:27 +02:00
parent 56cb6a2326
commit ec9c64a913
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -50,7 +50,7 @@ if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "RelWithDebInfo") set(CMAKE_BUILD_TYPE "RelWithDebInfo")
endif() endif()
# Include some common macros to simpilfy the Poco CMake files # Include some common macros to simplify the Poco CMake files
include(PocoMacros) include(PocoMacros)
if(POCO_STATIC) if(POCO_STATIC)

20
Foundation/include/Poco/Hash.h
View File

@@ -10,7 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH. // Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors. // and Contributors.
// //
// HashRange Copyright 2005-2014 Daniel James. // hashRange Copyright 2005-2014 Daniel James.
// (Extracted from Boost 1.75.0 lib and adapted for poco on 2021-03-31) // (Extracted from Boost 1.75.0 lib and adapted for poco on 2021-03-31)
// //
// SPDX-License-Identifier: BSL-1.0 // SPDX-License-Identifier: BSL-1.0
@@ -114,13 +114,13 @@ namespace Impl {
template <typename SizeT> template <typename SizeT>
inline void HashCombine(SizeT& seed, SizeT value) inline void hashCombine(SizeT& seed, SizeT value)
{ {
seed ^= value + 0x9e3779b9 + (seed<<6) + (seed>>2); seed ^= value + 0x9e3779b9 + (seed<<6) + (seed>>2);
} }
inline void HashCombine(Poco::UInt32& h1, Poco::UInt32 k1) inline void hashCombine(Poco::UInt32& h1, Poco::UInt32 k1)
{ {
const uint32_t c1 = 0xcc9e2d51; const uint32_t c1 = 0xcc9e2d51;
const uint32_t c2 = 0x1b873593; const uint32_t c2 = 0x1b873593;
@@ -138,7 +138,7 @@ inline void HashCombine(Poco::UInt32& h1, Poco::UInt32 k1)
#if defined(POCO_PTR_IS_64_BIT) && !(defined(__GNUC__) && ULONG_MAX == 0xffffffff) #if defined(POCO_PTR_IS_64_BIT) && !(defined(__GNUC__) && ULONG_MAX == 0xffffffff)
inline void HashCombine(Poco::UInt64& h, Poco::UInt64 k) inline void hashCombine(Poco::UInt64& h, Poco::UInt64 k)
{ {
const Poco::UInt64 m = UINT64_C(0xc6a4a7935bd1e995); const Poco::UInt64 m = UINT64_C(0xc6a4a7935bd1e995);
const int r = 47; const int r = 47;
@@ -163,21 +163,21 @@ inline void HashCombine(Poco::UInt64& h, Poco::UInt64 k)
template <class T> template <class T>
inline void HashCombine(std::size_t& seed, T const& v) inline void hashCombine(std::size_t& seed, T const& v)
{ {
Hash<T> hasher; Hash<T> hasher;
Impl::HashCombine(seed, hasher(v)); Impl::hashCombine(seed, hasher(v));
} }
template <class It> template <class It>
inline std::size_t HashRange(It first, It last) inline std::size_t hashRange(It first, It last)
{ {
std::size_t seed = 0; std::size_t seed = 0;
for(; first != last; ++first) for(; first != last; ++first)
{ {
HashCombine<typename std::iterator_traits<It>::value_type>(seed, *first); hashCombine<typename std::iterator_traits<It>::value_type>(seed, *first);
} }
return seed; return seed;
@@ -185,11 +185,11 @@ inline std::size_t HashRange(It first, It last)
template <class It> template <class It>
inline void HashRange(std::size_t& seed, It first, It last) inline void hashRange(std::size_t& seed, It first, It last)
{ {
for(; first != last; ++first) for(; first != last; ++first)
{ {
HashCombine<typename std::iterator_traits<It>::value_type>(seed, *first); hashCombine<typename std::iterator_traits<It>::value_type>(seed, *first);
} }
} }