diff options
author | Daniel Friesel <derf@finalrewind.org> | 2018-11-26 09:06:31 +0100 |
---|---|---|
committer | Daniel Friesel <derf@finalrewind.org> | 2018-11-26 09:06:31 +0100 |
commit | 1542f34f0e0fc53324f6fdc5905f4b77b252a789 (patch) | |
tree | d2126bc53f8759c36809ff25b9ae3a19fd7aa362 /include/lib/modernjson/adl_serializer.hpp | |
parent | e7711c06640f098323cab80934c198090e9120a3 (diff) |
update nlohmann modernjson to v3.4 (with bson support)
Diffstat (limited to 'include/lib/modernjson/adl_serializer.hpp')
-rw-r--r-- | include/lib/modernjson/adl_serializer.hpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/lib/modernjson/adl_serializer.hpp b/include/lib/modernjson/adl_serializer.hpp index 23584c5..45f2452 100644 --- a/include/lib/modernjson/adl_serializer.hpp +++ b/include/lib/modernjson/adl_serializer.hpp @@ -7,6 +7,7 @@ namespace nlohmann { + template<typename, typename> struct adl_serializer { @@ -16,14 +17,13 @@ struct adl_serializer This function is usually called by the `get()` function of the @ref basic_json class (either explicit or via conversion operators). - @param[in] j JSON value to read from + @param[in] j JSON value to read from @param[in,out] val value to write to */ template<typename BasicJsonType, typename ValueType> 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() - ) + 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); } @@ -35,15 +35,15 @@ struct adl_serializer class. @param[in,out] j JSON value to write to - @param[in] val value to read from + @param[in] val value to read from */ template <typename BasicJsonType, typename ValueType> static auto to_json(BasicJsonType& j, ValueType&& val) noexcept( noexcept(::nlohmann::to_json(j, std::forward<ValueType>(val)))) - -> decltype(::nlohmann::to_json(j, std::forward<ValueType>(val)), - void()) + -> decltype(::nlohmann::to_json(j, std::forward<ValueType>(val)), void()) { ::nlohmann::to_json(j, std::forward<ValueType>(val)); } }; -} + +} // namespace nlohmann |