Commit 322bc99d by Anthony VH

Reran amalgamate.

parent 333612ce
...@@ -4000,8 +4000,7 @@ auto from_json(BasicJsonType&& j, identity_tag<std::array<T, N>> tag) ...@@ -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) ...@@ -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> {});
......
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