amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-05-20 05:05:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

make from_json SFINAE-correct

Browse Source
This commit is contained in:
Théo DELRIEU
2018-09-06 16:54:42 +02:00
parent f7971f04a5
commit 4b4bbceebf
4 changed files with 16 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nlohmann/adl_serializer.hpp
+4 -2
View File
@@ -20,8 +20,10 @@ struct adl_serializer
@param[in,out] val value to write to
*/
template<typename BasicJsonType, typename ValueType>
static void from_json(BasicJsonType&& j, ValueType& val) noexcept(
noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), val)))
static auto from_json(BasicJsonType&& j, ValueType& val) noexcept(
noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), val))) -> decltype(
::nlohmann::from_json(std::forward<BasicJsonType>(j), val), void()
)
{
::nlohmann::from_json(std::forward<BasicJsonType>(j), val);
}