j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix from_json implementation for pair/tuple

Browse source 
Introduced by 6e4910d5c5

Fixes #707
This commit is contained in:
Théo DELRIEU 2017-08-22 23:40:10 +02:00 • committed by Théo DELRIEU
parent e45eaf6e30
commit bb1b4c934e
No known key found for this signature in database
GPG key ID: C64D5E244E08ADC6
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/json.hpp
View file

@ -1235,16 +1235,16 @@ void from_json(const BasicJsonType& j, ArithmeticType& val)
}
}
template<typename BasicJsonType, typename... Args>
void from_json(const BasicJsonType& j, std::pair<Args...>& p)
template<typename BasicJsonType, typename A1, typename A2>
void from_json(const BasicJsonType& j, std::pair<A1, A2>& p)
{
p = {j.at(0), j.at(1)};
p = {j.at(0).template get<A1>(), j.at(1).template get<A2>()};
}
template<typename BasicJsonType, typename Tuple, std::size_t... Idx>
void from_json_tuple_impl(const BasicJsonType& j, Tuple& t, index_sequence<Idx...>)
{
t = std::make_tuple(j.at(Idx)...);
t = std::make_tuple(j.at(Idx).template get<typename std::tuple_element<Idx, Tuple>::type>()...);
}
template<typename BasicJsonType, typename... Args>