mirror/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-01-20 00:03:02 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Reran amalgamate.

Browse Source
This commit is contained in:
Anthony VH 2021-03-24 13:03:36 +01:00
parent 333612ce35
commit 322bc99d8e
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
single_include/nlohmann/json.hpp
View File

@ -4000,8 +4000,7 @@ auto from_json(BasicJsonType&& j, identity_tag<std::array<T, N>> tag)
{ {
if (JSON_HEDLEY_UNLIKELY(!j.is_array())) if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
{ {
JSON_THROW(type_error::create(302, "type must be array, but is " + JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j));
std::string(j.type_name())));
} }
return from_json_inplace_array_impl(std::forward<BasicJsonType>(j), tag, make_index_sequence<N> {}); return from_json_inplace_array_impl(std::forward<BasicJsonType>(j), tag, make_index_sequence<N> {});
@ -4119,8 +4118,7 @@ auto from_json(BasicJsonType&& j, TupleRelated&& t)
{ {
if (JSON_HEDLEY_UNLIKELY(!j.is_array())) if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
{ {
JSON_THROW(type_error::create(302, "type must be array, but is " + JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j));
std::string(j.type_name())));
} }
return from_json_tuple_impl(std::forward<BasicJsonType>(j), std::forward<TupleRelated>(t), priority_tag<3> {}); return from_json_tuple_impl(std::forward<BasicJsonType>(j), std::forward<TupleRelated>(t), priority_tag<3> {});