External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

STY: minor formatting cleanup

Browse Source
This commit is contained in:
domsoll 2021-09-20 16:19:47 +02:00
parent 6d9bfe681d
commit 93aabac6ef
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/nlohmann/detail/conversions/from_json.hpp
View File

@ -182,6 +182,7 @@ auto from_json(const BasicJsonType& j, T (&arr)[N]) // NOLINT(cppcoreguidelines-
JSON_THROW(type_error::create(302, "array size must be " + std::to_string(N) + ", but is " + std::to_string(j.size()), j)); JSON_THROW(type_error::create(302, "array size must be " + std::to_string(N) + ", but is " + std::to_string(j.size()), j));
} }
#endif #endif
for (std::size_t i = 0; i < N; ++i) for (std::size_t i = 0; i < N; ++i)
{ {
arr[i] = j.at(i).template get<T>(); arr[i] = j.at(i).template get<T>();
@ -206,6 +207,7 @@ auto from_json_array_impl(const BasicJsonType& j, std::array<T, N>& arr,
JSON_THROW(type_error::create(302, "array size must be " + std::to_string(N) + ", but is " + std::to_string(j.size()), j)); JSON_THROW(type_error::create(302, "array size must be " + std::to_string(N) + ", but is " + std::to_string(j.size()), j));
} }
#endif #endif
for (std::size_t i = 0; i < N; ++i) for (std::size_t i = 0; i < N; ++i)
{ {
arr[i] = j.at(i).template get<T>(); arr[i] = j.at(i).template get<T>();
@ -289,6 +291,7 @@ std::array<T, sizeof...(Idx)> from_json_inplace_array_impl(BasicJsonType&& j,
JSON_THROW(type_error::create(302, "array size must be " + std::to_string(sizeof...(Idx)) + ", but is " + std::to_string(j.size()), j)); JSON_THROW(type_error::create(302, "array size must be " + std::to_string(sizeof...(Idx)) + ", but is " + std::to_string(j.size()), j));
} }
#endif #endif
return { { std::forward<BasicJsonType>(j).at(Idx).template get<T>()... } }; return { { std::forward<BasicJsonType>(j).at(Idx).template get<T>()... } };
} }

5
single_include/nlohmann/json.hpp
View File

@ -4053,6 +4053,7 @@ auto from_json(const BasicJsonType& j, T (&arr)[N]) // NOLINT(cppcoreguidelines-
JSON_THROW(type_error::create(302, "array size must be " + std::to_string(N) + ", but is " + std::to_string(j.size()), j)); JSON_THROW(type_error::create(302, "array size must be " + std::to_string(N) + ", but is " + std::to_string(j.size()), j));
} }
#endif #endif
for (std::size_t i = 0; i < N; ++i) for (std::size_t i = 0; i < N; ++i)
{ {
arr[i] = j.at(i).template get<T>(); arr[i] = j.at(i).template get<T>();
@ -4077,6 +4078,7 @@ auto from_json_array_impl(const BasicJsonType& j, std::array<T, N>& arr,
JSON_THROW(type_error::create(302, "array size must be " + std::to_string(N) + ", but is " + std::to_string(j.size()), j)); JSON_THROW(type_error::create(302, "array size must be " + std::to_string(N) + ", but is " + std::to_string(j.size()), j));
} }
#endif #endif
for (std::size_t i = 0; i < N; ++i) for (std::size_t i = 0; i < N; ++i)
{ {
arr[i] = j.at(i).template get<T>(); arr[i] = j.at(i).template get<T>();
@ -4160,6 +4162,7 @@ std::array<T, sizeof...(Idx)> from_json_inplace_array_impl(BasicJsonType&& j,
JSON_THROW(type_error::create(302, "array size must be " + std::to_string(sizeof...(Idx)) + ", but is " + std::to_string(j.size()), j)); JSON_THROW(type_error::create(302, "array size must be " + std::to_string(sizeof...(Idx)) + ", but is " + std::to_string(j.size()), j));
} }
#endif #endif
return { { std::forward<BasicJsonType>(j).at(Idx).template get<T>()... } }; return { { std::forward<BasicJsonType>(j).at(Idx).template get<T>()... } };
} }
@ -17663,7 +17666,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
detail::parser_callback_t<basic_json>cb = nullptr, detail::parser_callback_t<basic_json>cb = nullptr,
const bool allow_exceptions = true, const bool allow_exceptions = true,
const bool ignore_comments = false const bool ignore_comments = false
) )
{ {
return ::nlohmann::detail::parser<basic_json, InputAdapterType>(std::move(adapter), return ::nlohmann::detail::parser<basic_json, InputAdapterType>(std::move(adapter),
std::move(cb), allow_exceptions, ignore_comments); std::move(cb), allow_exceptions, ignore_comments);