amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-04-04 15:18:54 +00:00
Code Issues Packages Projects 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
parent 43ab8a2357 88243b3f8c
commit 1fd6c5882a
2 changed files with 2 additions and 2 deletions
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
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);
return seed;

2
single_include/nlohmann/json.hpp
View File

@@ -4454,7 +4454,7 @@ namespace detail
{
// 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);
return seed;