haraldwolff
/
json
mirror of https://github.com/nlohmann/json.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2349 from nlohmann/issue2348 

Remove -Wimplicit-fallthrough warning
pull/2352/head
Niels Lohmann 2020-08-11 09:05:02 +02:00 committed by GitHub
parent 37ce871eeb dd8cb2acc1
commit b888afe5f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/nlohmann/detail/hash.hpp
View File

@ -83,19 +83,19 @@ std::size_t hash(const BasicJsonType& j)
return combine(type, h);
}
case nlohmann::detail::value_t::number_unsigned:
case BasicJsonType::value_t::number_unsigned:
{
const auto h = std::hash<number_unsigned_t> {}(j.template get<number_unsigned_t>());
return combine(type, h);
}
case nlohmann::detail::value_t::number_float:
case BasicJsonType::value_t::number_float:
{
const auto h = std::hash<number_float_t> {}(j.template get<number_float_t>());
return combine(type, h);
}
case nlohmann::detail::value_t::binary:
case BasicJsonType::value_t::binary:
{
auto seed = combine(type, j.get_binary().size());
const auto h = std::hash<bool> {}(j.get_binary().has_subtype());
@ -108,8 +108,9 @@ std::size_t hash(const BasicJsonType& j)
return seed;
}
default: // LCOV_EXCL_LINE
JSON_ASSERT(false); // LCOV_EXCL_LINE
default: // LCOV_EXCL_LINE
JSON_ASSERT(false); // LCOV_EXCL_LINE
return 0; // LCOV_EXCL_LINE
}
}

3
include/nlohmann/detail/input/binary_reader.hpp
View File

@ -752,8 +752,9 @@ class binary_reader
return parse_cbor_internal(true, tag_handler);
}
default: // LCOV_EXCL_LINE
default: // LCOV_EXCL_LINE
JSON_ASSERT(false); // LCOV_EXCL_LINE
return false; // LCOV_EXCL_LINE
}
}

14
single_include/nlohmann/json.hpp
View File

@ -4666,19 +4666,19 @@ std::size_t hash(const BasicJsonType& j)
return combine(type, h);
}
case nlohmann::detail::value_t::number_unsigned:
case BasicJsonType::value_t::number_unsigned:
{
const auto h = std::hash<number_unsigned_t> {}(j.template get<number_unsigned_t>());
return combine(type, h);
}
case nlohmann::detail::value_t::number_float:
case BasicJsonType::value_t::number_float:
{
const auto h = std::hash<number_float_t> {}(j.template get<number_float_t>());
return combine(type, h);
}
case nlohmann::detail::value_t::binary:
case BasicJsonType::value_t::binary:
{
auto seed = combine(type, j.get_binary().size());
const auto h = std::hash<bool> {}(j.get_binary().has_subtype());
@ -4691,8 +4691,9 @@ std::size_t hash(const BasicJsonType& j)
return seed;
}
default: // LCOV_EXCL_LINE
JSON_ASSERT(false); // LCOV_EXCL_LINE
default: // LCOV_EXCL_LINE
JSON_ASSERT(false); // LCOV_EXCL_LINE
return 0; // LCOV_EXCL_LINE
}
}
@ -8391,8 +8392,9 @@ class binary_reader
return parse_cbor_internal(true, tag_handler);
}
default: // LCOV_EXCL_LINE
default: // LCOV_EXCL_LINE
JSON_ASSERT(false); // LCOV_EXCL_LINE
return false; // LCOV_EXCL_LINE
}
}