From 281349d0d68542935f1c96a2ac50577fe0b5e243 Mon Sep 17 00:00:00 2001 From: T0b1-iOS Date: Sat, 18 Jul 2020 06:28:11 +0200 Subject: [PATCH 1/2] add inline specifier for detail::combine --- include/nlohmann/detail/hash.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/nlohmann/detail/hash.hpp b/include/nlohmann/detail/hash.hpp index d3313e96..4094cc94 100644 --- a/include/nlohmann/detail/hash.hpp +++ b/include/nlohmann/detail/hash.hpp @@ -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; From 88243b3f8c68341b9ac10672457ad53059a3c783 Mon Sep 17 00:00:00 2001 From: T0b1-iOS Date: Sat, 18 Jul 2020 07:09:56 +0200 Subject: [PATCH 2/2] run amalgamate --- single_include/nlohmann/json.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 1d8b5fb6..8c604c52 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -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;