lib/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-07-25 13:41:56 +03:00
Code Activity

🔨 approach to un-break the changes for #462

Browse Source
This commit is contained in:
Niels Lohmann
2017-08-16 20:11:05 +02:00
parent 22b59693f1
commit aba8b58492
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/json.hpp
View File

@ -13182,6 +13182,15 @@ class basic_json
return binary_reader(i).parse_cbor(strict);
}
/*!
@copydoc from_cbor(detail::input_adapter, const bool)
*/
template<typename A1, typename A2,
detail::enable_if_t<std::is_constructible<detail::input_adapter, A1, A2>::value, int> = 0>
static basic_json from_cbor(A1&& a1, A2&& a2, const bool strict = true)
{
return binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).parse_cbor(strict);
}
/*!
@brief create a JSON value from an input in MessagePack format
@ -13260,6 +13269,16 @@ class basic_json
return binary_reader(i).parse_msgpack(strict);
}
/*!
@copydoc from_msgpack(detail::input_adapter, const bool)
*/
template<typename A1, typename A2,
detail::enable_if_t<std::is_constructible<detail::input_adapter, A1, A2>::value, int> = 0>
static basic_json from_msgpack(A1&& a1, A2&& a2, const bool strict = true)
{
return binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).parse_msgpack(strict);
}
/// @}
//////////////////////////