Skip to content

J
json
Unverified Commit 1aceeff3 authored by Niels Lohmann's avatar Niels Lohmann
Browse files
Options

🚨 fix C4244 warning

parent 0a0eb7a8
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
include/nlohmann/detail/hash.hpp
View file @ 1aceeff3
...@@ -103,7 +103,7 @@ std::size_t hash(const BasicJsonType& j) ...@@ -103,7 +103,7 @@ std::size_t hash(const BasicJsonType& j)
auto seed = combine(type, j.get_binary().size()); auto seed = combine(type, j.get_binary().size());
const auto h = std::hash<bool> {}(j.get_binary().has_subtype()); const auto h = std::hash<bool> {}(j.get_binary().has_subtype());
seed = combine(seed, h); seed = combine(seed, h);
seed = combine(seed, j.get_binary().subtype()); seed = combine(seed, static_cast<std::size_t>(j.get_binary().subtype()));
for (const auto byte : j.get_binary()) for (const auto byte : j.get_binary())
{ {
seed = combine(seed, std::hash<std::uint8_t> {}(byte)); seed = combine(seed, std::hash<std::uint8_t> {}(byte));
......
single_include/nlohmann/json.hpp
View file @ 1aceeff3
...@@ -5266,7 +5266,7 @@ std::size_t hash(const BasicJsonType& j) ...@@ -5266,7 +5266,7 @@ std::size_t hash(const BasicJsonType& j)
auto seed = combine(type, j.get_binary().size()); auto seed = combine(type, j.get_binary().size());
const auto h = std::hash<bool> {}(j.get_binary().has_subtype()); const auto h = std::hash<bool> {}(j.get_binary().has_subtype());
seed = combine(seed, h); seed = combine(seed, h);
seed = combine(seed, j.get_binary().subtype()); seed = combine(seed, static_cast<std::size_t>(j.get_binary().subtype()));
for (const auto byte : j.get_binary()) for (const auto byte : j.get_binary())
{ {
seed = combine(seed, std::hash<std::uint8_t> {}(byte)); seed = combine(seed, std::hash<std::uint8_t> {}(byte));
......
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