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

Fix operator== overload ambiguity

Browse Source
This commit is contained in:
Andreas C. Osowski 2018-04-24 21:58:51 +02:00
parent b5d1755dfb
commit 435fc32a69
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/nlohmann/json.hpp
View File

@ -5533,8 +5533,10 @@ class basic_json
@brief comparison: equal
@copydoc operator==(const_reference, const_reference)
*/
template<typename ScalarType, typename std::enable_if<
std::is_scalar<ScalarType>::value, int>::type = 0>
template < typename ScalarType, typename std::enable_if <
std::is_scalar<ScalarType>::value, int >::type = 0,
typename std::enable_if <
std::is_same<std::nullptr_t, std::remove_cv<ScalarType>>::value, int >::type = 0 >
friend bool operator==(const_reference lhs, const ScalarType rhs) noexcept
{
return (lhs == basic_json(rhs));
@ -5544,8 +5546,10 @@ class basic_json
@brief comparison: equal
@copydoc operator==(const_reference, const_reference)
*/
template<typename ScalarType, typename std::enable_if<
std::is_scalar<ScalarType>::value, int>::type = 0>
template < typename ScalarType, typename std::enable_if <
std::is_scalar<ScalarType>::value, int >::type = 0,
typename std::enable_if <
std::is_same<std::nullptr_t, std::remove_cv<ScalarType>>::value, int >::type = 0 >
friend bool operator==(const ScalarType lhs, const_reference rhs) noexcept
{
return (basic_json(lhs) == rhs);

12
single_include/nlohmann/json.hpp
View File

@ -15174,8 +15174,10 @@ class basic_json
@brief comparison: equal
@copydoc operator==(const_reference, const_reference)
*/
template<typename ScalarType, typename std::enable_if<
std::is_scalar<ScalarType>::value, int>::type = 0>
template < typename ScalarType, typename std::enable_if <
std::is_scalar<ScalarType>::value, int >::type = 0,
typename std::enable_if <
!std::is_same<std::nullptr_t, std::remove_cv<ScalarType>>::value, int >::type = 0 >
friend bool operator==(const_reference lhs, const ScalarType rhs) noexcept
{
return (lhs == basic_json(rhs));
@ -15185,8 +15187,10 @@ class basic_json
@brief comparison: equal
@copydoc operator==(const_reference, const_reference)
*/
template<typename ScalarType, typename std::enable_if<
std::is_scalar<ScalarType>::value, int>::type = 0>
template < typename ScalarType, typename std::enable_if <
std::is_scalar<ScalarType>::value, int >::type = 0,
typename std::enable_if <
!std::is_same<std::nullptr_t, std::remove_cv<ScalarType>>::value, int >::type = 0 >
friend bool operator==(const ScalarType lhs, const_reference rhs) noexcept
{
return (basic_json(lhs) == rhs);