lib/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-07-28 12:02:00 +03:00
Code Activity

🚨 fix warning

Browse Source
This commit is contained in:
Niels Lohmann
2024-04-14 12:38:17 +02:00
parent 760f54f993
commit e8cfe1f712
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -380,6 +380,12 @@ inline void from_json(const BasicJsonType& j, ArithmeticType& val)
} }
} }
template<typename BasicJsonType, typename... Args, std::size_t... Idx>
std::tuple<Args...> from_json_tuple_impl_base(const BasicJsonType& j, index_sequence<Idx...> /*unused*/)
{
return std::make_tuple(j.at(Idx).template get<Args>()...);
}
template<typename BasicJsonType, typename... Args, std::size_t... Idx> template<typename BasicJsonType, typename... Args, std::size_t... Idx>
std::tuple<Args...> from_json_tuple_impl_base(BasicJsonType&& j, index_sequence<Idx...> /*unused*/) std::tuple<Args...> from_json_tuple_impl_base(BasicJsonType&& j, index_sequence<Idx...> /*unused*/)
{ {

6
single_include/nlohmann/json.hpp
View File

@ -5007,6 +5007,12 @@ inline void from_json(const BasicJsonType& j, ArithmeticType& val)
} }
} }
template<typename BasicJsonType, typename... Args, std::size_t... Idx>
std::tuple<Args...> from_json_tuple_impl_base(const BasicJsonType& j, index_sequence<Idx...> /*unused*/)
{
return std::make_tuple(j.at(Idx).template get<Args>()...);
}
template<typename BasicJsonType, typename... Args, std::size_t... Idx> template<typename BasicJsonType, typename... Args, std::size_t... Idx>
std::tuple<Args...> from_json_tuple_impl_base(BasicJsonType&& j, index_sequence<Idx...> /*unused*/) std::tuple<Args...> from_json_tuple_impl_base(BasicJsonType&& j, index_sequence<Idx...> /*unused*/)
{ {

6
tests/src/unit-conversions.cpp
View File

@ -1515,9 +1515,9 @@ NLOHMANN_JSON_SERIALIZE_ENUM(cards,
enum TaskState enum TaskState
{ {
TS_STOPPED, TS_STOPPED = 0,
TS_RUNNING, TS_RUNNING = 1,
TS_COMPLETED, TS_COMPLETED = 2,
TS_INVALID = -1, TS_INVALID = -1,
}; };