External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Running the CI test locally

Browse Source
This commit is contained in:
Kunal Tyagi 2021-07-20 11:52:40 +09:00
parent 7002b1daad
commit b5d4cbb508
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
single_include/nlohmann/json.hpp
View File

@ -2607,9 +2607,15 @@ using is_detected_convertible =
@def NLOHMANN_DEFINE_TYPE_INTRUSIVE_IMPL @def NLOHMANN_DEFINE_TYPE_INTRUSIVE_IMPL
@since version 3.9.2 @since version 3.9.2
*/ */
#define NLOHMANN_DEFINE_TYPE_INTRUSIVE_IMPL(BasicJsonType, Type, ...) \ #define NLOHMANN_DEFINE_TYPE_INTRUSIVE_IMPL(BasicJsonType, Type, ...) \
friend void to_json(BasicJsonType& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \ friend void to_json(BasicJsonType& nlohmann_json_j, const Type& nlohmann_json_t) \
friend void from_json(const BasicJsonType& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) } { \
NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) \
} \
friend void from_json(const BasicJsonType& nlohmann_json_j, Type& nlohmann_json_t) \
{ \
NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) \
}
/*! /*!
@brief macro to briefly define non-intrusive serialization of a given type to/from JSON @brief macro to briefly define non-intrusive serialization of a given type to/from JSON
@ -2617,9 +2623,15 @@ using is_detected_convertible =
@def NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_IMPL @def NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_IMPL
@since version 3.9.2 @since version 3.9.2
*/ */
#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_IMPL(BasicJsonType, Type, ...) \ #define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_IMPL(BasicJsonType, Type, ...) \
inline void to_json(BasicJsonType& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \ inline void to_json(BasicJsonType& nlohmann_json_j, const Type& nlohmann_json_t) \
inline void from_json(const BasicJsonType& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) } { \
NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) \
} \
inline void from_json(const BasicJsonType& nlohmann_json_j, Type& nlohmann_json_t) \
{ \
NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) \
}
/*! /*!
@brief macro to briefly define intrusive serialization of given type to/from nlohmann::json @brief macro to briefly define intrusive serialization of given type to/from nlohmann::json
@ -2699,7 +2711,7 @@ using is_detected_convertible =
friend void from_json(const BasicJsonType& nlohmann_json_j, Type& nlohmann_json_t) \ friend void from_json(const BasicJsonType& nlohmann_json_j, Type& nlohmann_json_t) \
{ \ { \
NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) \ NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) \
} \ }
/*! /*!
@brief macro to briefly define non-intrusive serialization of a given type to/from any basic_json object @brief macro to briefly define non-intrusive serialization of a given type to/from any basic_json object

2
tests/src/unit-udt_macro.cpp
View File

@ -97,7 +97,7 @@ Visibility: \
y == other.y && \ y == other.y && \
z == other.z; \ z == other.z; \
} \ } \
Visibility : int a = 0; \ Visibility : int a = 0; \
int b = 0; \ int b = 0; \
int c = 0; \ int c = 0; \
int d = 0; \ int d = 0; \