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

💚 fix build

Browse Source
This commit is contained in:
Niels Lohmann 2021-11-03 20:41:16 +01:00
parent 42c37d9c01
commit b62f82e664
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/nlohmann/json.hpp
View File

@ -4708,15 +4708,15 @@ std::string to_string(const NLOHMANN_BASIC_JSON_TPL& j)
/////////////////////// ///////////////////////
/// hash value for JSON objects /// hash value for JSON objects
template<typename BasicJsonType> NLOHMANN_BASIC_JSON_TPL_DECLARATION
struct std::hash struct std::hash<nlohmann::NLOHMANN_BASIC_JSON_TPL>
{ {
/*! /*!
@brief return a hash value for a JSON object @brief return a hash value for a JSON object
@since version 1.0.0, extended for arbitrary basic_json types in 3.10.5. @since version 1.0.0, extended for arbitrary basic_json types in 3.10.5.
*/ */
std::size_t operator()(const BasicJsonType& j) const std::size_t operator()(const nlohmann::NLOHMANN_BASIC_JSON_TPL& j) const
{ {
return nlohmann::detail::hash(j); return nlohmann::detail::hash(j);
} }
@ -4751,14 +4751,14 @@ namespace std
@since version 1.0.0 @since version 1.0.0
*/ */
template<> template<>
inline void swap<nlohmann::json>(nlohmann::json& j1, nlohmann::json& j2) noexcept( // NOLINT(readability-inconsistent-declaration-parameter-name) inline void swap<nlohmann::json>(nlohmann::json& j1, nlohmann::json& j2) noexcept( // NOLINT(readability-inconsistent-declaration-parameter-name)
is_nothrow_move_constructible<nlohmann::json>::value&& // NOLINT(misc-redundant-expression) is_nothrow_move_constructible<nlohmann::json>::value&& // NOLINT(misc-redundant-expression)
is_nothrow_move_assignable<nlohmann::json>::value is_nothrow_move_assignable<nlohmann::json>::value)
)
{ {
j1.swap(j2); j1.swap(j2);
} }
}
// namespace std // namespace std
#endif #endif

14
single_include/nlohmann/json.hpp
View File

@ -22209,15 +22209,15 @@ std::string to_string(const NLOHMANN_BASIC_JSON_TPL& j)
/////////////////////// ///////////////////////
/// hash value for JSON objects /// hash value for JSON objects
template<typename BasicJsonType> NLOHMANN_BASIC_JSON_TPL_DECLARATION
struct std::hash struct std::hash<nlohmann::NLOHMANN_BASIC_JSON_TPL>
{ {
/*! /*!
@brief return a hash value for a JSON object @brief return a hash value for a JSON object
@since version 1.0.0, extended for arbitrary basic_json types in 3.10.5. @since version 1.0.0, extended for arbitrary basic_json types in 3.10.5.
*/ */
std::size_t operator()(const BasicJsonType& j) const std::size_t operator()(const nlohmann::NLOHMANN_BASIC_JSON_TPL& j) const
{ {
return nlohmann::detail::hash(j); return nlohmann::detail::hash(j);
} }
@ -22252,14 +22252,14 @@ namespace std
@since version 1.0.0 @since version 1.0.0
*/ */
template<> template<>
inline void swap<nlohmann::json>(nlohmann::json& j1, nlohmann::json& j2) noexcept( // NOLINT(readability-inconsistent-declaration-parameter-name) inline void swap<nlohmann::json>(nlohmann::json& j1, nlohmann::json& j2) noexcept( // NOLINT(readability-inconsistent-declaration-parameter-name)
is_nothrow_move_constructible<nlohmann::json>::value&& // NOLINT(misc-redundant-expression) is_nothrow_move_constructible<nlohmann::json>::value&& // NOLINT(misc-redundant-expression)
is_nothrow_move_assignable<nlohmann::json>::value is_nothrow_move_assignable<nlohmann::json>::value)
)
{ {
j1.swap(j2); j1.swap(j2);
} }
}
// namespace std // namespace std
#endif #endif