run amalgamate

88243b3f · T0b1-iOS · 281349d0 · 88243b3f
Unverified Commit 88243b3f authored Jul 18, 2020 by T0b1-iOS
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

single_include/nlohmann/json.hpp single_include/nlohmann/json.hpp +1 -1

No files found.
--- 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;