Skip to content

J
json
Unverified Commit 1fd6c588 by Niels Lohmann Committed by GitHub
Options

Merge pull request #2285 from T0b1-iOS/develop

add inline specifier for detail::combine
parents 43ab8a23 88243b3f
Showing with 2 additions and 2 deletions
include/nlohmann/detail/hash.hpp
...@@ -9,7 +9,7 @@ namespace detail ...@@ -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;
......
single_include/nlohmann/json.hpp
...@@ -4454,7 +4454,7 @@ namespace detail ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment