lib/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-07-13 20:21:48 +03:00
Code Activity

🔀 merged #415 (fix for #414)

Browse Source
This commit is contained in:
Niels Lohmann
2017-02-16 08:50:20 +01:00
parent 2c17c1b1b2 6bf93b3d06
commit 057b1e606b
4 changed files with 60 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/json.hpp
View File

@ -5963,34 +5963,24 @@ class basic_json
/*!
@brief comparison: equal
The functions compares the given JSON value against a null pointer. As the
null pointer can be used to initialize a JSON value to null, a comparison
of JSON value @a v with a null pointer should be equivalent to call
`v.is_null()`.
@param[in] v JSON value to consider
@return whether @a v is null
@complexity Constant.
@liveexample{The example compares several JSON types to the null pointer.
,operator__equal__nullptr_t}
@since version 1.0.0
@copydoc operator==(const_reference, const_reference)
*/
friend bool operator==(const_reference v, std::nullptr_t) noexcept
template<typename ScalarType, typename std::enable_if<
std::is_scalar<ScalarType>::value, int>::type = 0>
friend bool operator==(const_reference lhs, const ScalarType rhs) noexcept
{
return v.is_null();
return (lhs == basic_json(rhs));
}
/*!
@brief comparison: equal
@copydoc operator==(const_reference, std::nullptr_t)
@copydoc operator==(const_reference, const_reference)
*/
friend bool operator==(std::nullptr_t, const_reference v) noexcept
template<typename ScalarType, typename std::enable_if<
std::is_scalar<ScalarType>::value, int>::type = 0>
friend bool operator==(const ScalarType lhs, const_reference rhs) noexcept
{
return v.is_null();
return (basic_json(lhs) == rhs);
}
/*!
@ -6016,34 +6006,24 @@ class basic_json
/*!
@brief comparison: not equal
The functions compares the given JSON value against a null pointer. As the
null pointer can be used to initialize a JSON value to null, a comparison
of JSON value @a v with a null pointer should be equivalent to call
`not v.is_null()`.
@param[in] v JSON value to consider
@return whether @a v is not null
@complexity Constant.
@liveexample{The example compares several JSON types to the null pointer.
,operator__notequal__nullptr_t}
@since version 1.0.0
@copydoc operator!=(const_reference, const_reference)
*/
friend bool operator!=(const_reference v, std::nullptr_t) noexcept
template<typename ScalarType, typename std::enable_if<
std::is_scalar<ScalarType>::value, int>::type = 0>
friend bool operator!=(const_reference lhs, const ScalarType rhs) noexcept
{
return not v.is_null();
return (lhs != basic_json(rhs));
}
/*!
@brief comparison: not equal
@copydoc operator!=(const_reference, std::nullptr_t)
@copydoc operator!=(const_reference, const_reference)
*/
friend bool operator!=(std::nullptr_t, const_reference v) noexcept
template<typename ScalarType, typename std::enable_if<
std::is_scalar<ScalarType>::value, int>::type = 0>
friend bool operator!=(const ScalarType lhs, const_reference rhs) noexcept
{
return not v.is_null();
return (basic_json(lhs) != rhs);
}
/*!