mirror/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-06-13 16:49:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixing CI errors.

Browse Source
This commit is contained in:
Anthony VH 2021-03-24 23:33:21 +01:00
parent 8e79917d32
commit 2b865131d8
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -258,7 +258,7 @@ template < typename BasicJsonType, typename T, std::size_t... Idx >
std::array<T, sizeof...(Idx)> from_json_inplace_array_impl(BasicJsonType&& j, std::array<T, sizeof...(Idx)> from_json_inplace_array_impl(BasicJsonType&& j,
identity_tag<std::array<T, sizeof...(Idx)>> /*unused*/, index_sequence<Idx...> /*unused*/) identity_tag<std::array<T, sizeof...(Idx)>> /*unused*/, index_sequence<Idx...> /*unused*/)
{ {
return { std::forward<BasicJsonType>(j).at(Idx).template get<T>()... }; return { { std::forward<BasicJsonType>(j).at(Idx).template get<T>()... } };
} }
template < typename BasicJsonType, typename T, std::size_t N > template < typename BasicJsonType, typename T, std::size_t N >

2
single_include/nlohmann/json.hpp
View File

@ -3991,7 +3991,7 @@ template < typename BasicJsonType, typename T, std::size_t... Idx >
std::array<T, sizeof...(Idx)> from_json_inplace_array_impl(BasicJsonType&& j, std::array<T, sizeof...(Idx)> from_json_inplace_array_impl(BasicJsonType&& j,
identity_tag<std::array<T, sizeof...(Idx)>> /*unused*/, index_sequence<Idx...> /*unused*/) identity_tag<std::array<T, sizeof...(Idx)>> /*unused*/, index_sequence<Idx...> /*unused*/)
{ {
return { std::forward<BasicJsonType>(j).at(Idx).template get<T>()... }; return { { std::forward<BasicJsonType>(j).at(Idx).template get<T>()... } };
} }
template < typename BasicJsonType, typename T, std::size_t N > template < typename BasicJsonType, typename T, std::size_t N >

2
test/src/unit-regression2.cpp
View File

@ -149,7 +149,7 @@ namespace nlohmann
template <> template <>
struct adl_serializer<NonDefaultConstructible> struct adl_serializer<NonDefaultConstructible>
{ {
static NonDefaultConstructible from_json (json const& j) noexcept static NonDefaultConstructible from_json (json const& j)
{ {
return NonDefaultConstructible(j.get<int>()); return NonDefaultConstructible(j.get<int>());
} }