j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2285 from T0b1-iOS/develop

Browse source 
add inline specifier for detail::combine
This commit is contained in:
Niels Lohmann 2020-07-19 17:55:51 +02:00 committed by GitHub
commit 1fd6c5882a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/nlohmann/detail/hash.hpp
View file

@ -9,7 +9,7 @@ namespace detail
{ {
// boost::hash_combine // boost::hash_combine
std::size_t combine(std::size_t seed, std::size_t h) noexcept inline std::size_t combine(std::size_t seed, std::size_t h) noexcept
{ {
seed ^= h + 0x9e3779b9 + (seed << 6U) + (seed >> 2U); seed ^= h + 0x9e3779b9 + (seed << 6U) + (seed >> 2U);
return seed; return seed;

2
single_include/nlohmann/json.hpp
View file

@ -4454,7 +4454,7 @@ namespace detail
{ {
// boost::hash_combine // boost::hash_combine
std::size_t combine(std::size_t seed, std::size_t h) noexcept inline std::size_t combine(std::size_t seed, std::size_t h) noexcept
{ {
seed ^= h + 0x9e3779b9 + (seed << 6U) + (seed >> 2U); seed ^= h + 0x9e3779b9 + (seed << 6U) + (seed >> 2U);
return seed; return seed;