haraldwolff
/
json
mirror of https://github.com/nlohmann/json.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add adl_serializer.hpp

pull/700/head
Théo DELRIEU 2017-08-14 18:22:49 +02:00
parent 8e9714fe3d
commit 9cab30cfce
No known key found for this signature in database
GPG Key ID: 51AC4B3A2C47C10F
3 changed files with 51 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -22,7 +22,8 @@ SRCS = ${SRCDIR}/json.hpp \
${SRCDIR}/detail/parsing/binary_reader.hpp \
${SRCDIR}/detail/parsing/binary_writer.hpp \
${SRCDIR}/detail/serializer.hpp \
${SRCDIR}/detail/json_ref.hpp
${SRCDIR}/detail/json_ref.hpp \
${SRCDIR}/adl_serializer.hpp
# main target
all:

48
src/adl_serializer.hpp 100644
View File

@ -0,0 +1,48 @@
#ifndef NLOHMANN_JSON_ADL_SERIALIZER_HPP
#define NLOHMANN_JSON_ADL_SERIALIZER_HPP
#include <utility>
#include "detail/conversions/from_json.hpp"
#include "detail/conversions/to_json.hpp"
namespace nlohmann
{
template<typename, typename>
struct adl_serializer
{
/*!
@brief convert a JSON value to any value type
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,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)))
{
::nlohmann::from_json(std::forward<BasicJsonType>(j), val);
}
/*!
@brief convert any value type to a JSON value
This function is usually called by the constructors of the @ref basic_json
class.
@param[in,out] j JSON value to write to
@param[in] val value to read from
*/
template<typename BasicJsonType, typename ValueType>
static void to_json(BasicJsonType& j, ValueType&& val) noexcept(
noexcept(::nlohmann::to_json(j, std::forward<ValueType>(val))))
{
::nlohmann::to_json(j, std::forward<ValueType>(val));
}
};
}
#endif

38
src/json.hpp
View File

@ -70,6 +70,7 @@ SOFTWARE.
#include "detail/parsing/binary_writer.hpp"
#include "detail/serializer.hpp"
#include "detail/json_ref.hpp"
#include "adl_serializer.hpp"
/*!
@brief namespace for Niels Lohmann
@ -78,42 +79,6 @@ SOFTWARE.
*/
namespace nlohmann
{
template<typename, typename>
struct adl_serializer
{
/*!
@brief convert a JSON value to any value type
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,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)))
{
::nlohmann::from_json(std::forward<BasicJsonType>(j), val);
}
/*!
@brief convert any value type to a JSON value
This function is usually called by the constructors of the @ref basic_json
class.
@param[in,out] j JSON value to write to
@param[in] val value to read from
*/
template<typename BasicJsonType, typename ValueType>
static void to_json(BasicJsonType& j, ValueType&& val) noexcept(
noexcept(::nlohmann::to_json(j, std::forward<ValueType>(val))))
{
::nlohmann::to_json(j, std::forward<ValueType>(val));
}
};
class json_pointer
{
/// allow basic_json to access private members
@ -7969,7 +7934,6 @@ inline bool operator!=(json_pointer const& lhs, json_pointer const& rhs) noexcep
}
} // namespace nlohmann
///////////////////////
// nonmember support //
///////////////////////