run amalgamate

2020-07-18 07:09:56 +02:00 · 2020-07-18 07:09:56 +02:00 · 88243b3f8c
parent 281349d0d6
commit 88243b3f8c
1 changed files with 1 additions and 1 deletions
--- 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;