mirror of https://github.com/nlohmann/json.git
amalgamate
parent
fc191903cc
commit
8d896613a7
|
@ -22913,8 +22913,6 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
// template<typename ScalarType, typename std::enable_if<
|
|
||||||
// std::is_scalar<ScalarType>::value, int>::type = 0>
|
|
||||||
/// @brief comparison: equal
|
/// @brief comparison: equal
|
||||||
/// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
|
/// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
|
||||||
template <typename T>
|
template <typename T>
|
||||||
|
@ -22924,6 +22922,15 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
|
||||||
return *this == basic_json(rhs);
|
return *this == basic_json(rhs);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// @brief comparison: not equal
|
||||||
|
/// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
|
||||||
|
template <typename T>
|
||||||
|
requires detail::json_compatible_type<T, basic_json_t>::value
|
||||||
|
bool operator!=(T rhs) const noexcept
|
||||||
|
{
|
||||||
|
return *this != basic_json(rhs);
|
||||||
|
}
|
||||||
|
|
||||||
/// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
|
/// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
|
||||||
bool operator==(std::nullptr_t rhs) const noexcept
|
bool operator==(std::nullptr_t rhs) const noexcept
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue