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

updated to develop-branch

Browse Source
This commit is contained in:
Luca 2022-10-07 23:59:26 +02:00
parent 4b0ec7e1f2
commit fe24dae377
2 changed files with 147 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
docs/examples/accept__string
View File

294
single_include/nlohmann/json.hpp
View File

@ -292,9 +292,9 @@ inline bool operator<(const value_t lhs, const value_t rhs) noexcept
using type = Op<Args...>; using type = Op<Args...>;
}; };
const auto l_index = static_cast<std::size_t>(lhs); const auto l_index = static_cast<std::size_t>(lhs);
const auto r_index = static_cast<std::size_t>(rhs); const auto r_index = static_cast<std::size_t>(rhs);
return l_index < order.size() && r_index < order.size() && order[l_index] < order[r_index]; return l_index < order.size() && r_index < order.size() && order[l_index] < order[r_index];
} }
} // namespace detail } // namespace detail
} // namespace nlohmann } // namespace nlohmann
@ -23463,182 +23463,182 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
} }
#endif #endif
#else #else
/// @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/
friend bool operator==(const_reference lhs, const_reference rhs) noexcept friend bool operator==(const_reference lhs, const_reference rhs) noexcept
{ {
#ifdef __GNUC__ #ifdef __GNUC__
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wfloat-equal" #pragma GCC diagnostic ignored "-Wfloat-equal"
#endif #endif
JSON_IMPLEMENT_OPERATOR( ==, true, false, false) JSON_IMPLEMENT_OPERATOR( ==, true, false, false)
#ifdef __GNUC__ #ifdef __GNUC__
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
} }
/// @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 ScalarType, typename std::enable_if< template<typename ScalarType, typename std::enable_if<
std::is_scalar<ScalarType>::value, int>::type = 0> std::is_scalar<ScalarType>::value, int>::type = 0>
friend bool operator==(const_reference lhs, ScalarType rhs) noexcept friend bool operator==(const_reference lhs, ScalarType rhs) noexcept
{ {
return lhs == basic_json(rhs); return lhs == basic_json(rhs);
} }
/// @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 ScalarType, typename std::enable_if< template<typename ScalarType, typename std::enable_if<
std::is_scalar<ScalarType>::value, int>::type = 0> std::is_scalar<ScalarType>::value, int>::type = 0>
friend bool operator==(ScalarType lhs, const_reference rhs) noexcept friend bool operator==(ScalarType lhs, const_reference rhs) noexcept
{ {
return basic_json(lhs) == rhs; return basic_json(lhs) == rhs;
} }
/// @brief comparison: not equal /// @brief comparison: not equal
/// @sa https://json.nlohmann.me/api/basic_json/operator_ne/ /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
friend bool operator!=(const_reference lhs, const_reference rhs) noexcept friend bool operator!=(const_reference lhs, const_reference rhs) noexcept
{
if (compares_unordered(lhs, rhs, true))
{ {
if (compares_unordered(lhs, rhs, true)) return false;
{
return false;
}
return !(lhs == rhs);
} }
return !(lhs == rhs);
}
/// @brief comparison: not equal /// @brief comparison: not equal
/// @sa https://json.nlohmann.me/api/basic_json/operator_ne/ /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
template<typename ScalarType, typename std::enable_if< template<typename ScalarType, typename std::enable_if<
std::is_scalar<ScalarType>::value, int>::type = 0> std::is_scalar<ScalarType>::value, int>::type = 0>
friend bool operator!=(const_reference lhs, ScalarType rhs) noexcept friend bool operator!=(const_reference lhs, ScalarType rhs) noexcept
{ {
return lhs != basic_json(rhs); return lhs != basic_json(rhs);
} }
/// @brief comparison: not equal /// @brief comparison: not equal
/// @sa https://json.nlohmann.me/api/basic_json/operator_ne/ /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
template<typename ScalarType, typename std::enable_if< template<typename ScalarType, typename std::enable_if<
std::is_scalar<ScalarType>::value, int>::type = 0> std::is_scalar<ScalarType>::value, int>::type = 0>
friend bool operator!=(ScalarType lhs, const_reference rhs) noexcept friend bool operator!=(ScalarType lhs, const_reference rhs) noexcept
{ {
return basic_json(lhs) != rhs; return basic_json(lhs) != rhs;
} }
/// @brief comparison: less than /// @brief comparison: less than
/// @sa https://json.nlohmann.me/api/basic_json/operator_lt/ /// @sa https://json.nlohmann.me/api/basic_json/operator_lt/
friend bool operator<(const_reference lhs, const_reference rhs) noexcept friend bool operator<(const_reference lhs, const_reference rhs) noexcept
{ {
// default_result is used if we cannot compare values. In that case, // default_result is used if we cannot compare values. In that case,
// we compare types. Note we have to call the operator explicitly, // we compare types. Note we have to call the operator explicitly,
// because MSVC has problems otherwise. // because MSVC has problems otherwise.
JSON_IMPLEMENT_OPERATOR( <, false, false, operator<(lhs_type, rhs_type)) JSON_IMPLEMENT_OPERATOR( <, false, false, operator<(lhs_type, rhs_type))
} }
/// @brief comparison: less than /// @brief comparison: less than
/// @sa https://json.nlohmann.me/api/basic_json/operator_lt/ /// @sa https://json.nlohmann.me/api/basic_json/operator_lt/
template<typename ScalarType, typename std::enable_if< template<typename ScalarType, typename std::enable_if<
std::is_scalar<ScalarType>::value, int>::type = 0> std::is_scalar<ScalarType>::value, int>::type = 0>
friend bool operator<(const_reference lhs, ScalarType rhs) noexcept friend bool operator<(const_reference lhs, ScalarType rhs) noexcept
{ {
return lhs < basic_json(rhs); return lhs < basic_json(rhs);
} }
/// @brief comparison: less than /// @brief comparison: less than
/// @sa https://json.nlohmann.me/api/basic_json/operator_lt/ /// @sa https://json.nlohmann.me/api/basic_json/operator_lt/
template<typename ScalarType, typename std::enable_if< template<typename ScalarType, typename std::enable_if<
std::is_scalar<ScalarType>::value, int>::type = 0> std::is_scalar<ScalarType>::value, int>::type = 0>
friend bool operator<(ScalarType lhs, const_reference rhs) noexcept friend bool operator<(ScalarType lhs, const_reference rhs) noexcept
{ {
return basic_json(lhs) < rhs; return basic_json(lhs) < rhs;
} }
/// @brief comparison: less than or equal /// @brief comparison: less than or equal
/// @sa https://json.nlohmann.me/api/basic_json/operator_le/ /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
friend bool operator<=(const_reference lhs, const_reference rhs) noexcept friend bool operator<=(const_reference lhs, const_reference rhs) noexcept
{
if (compares_unordered(lhs, rhs, true))
{ {
if (compares_unordered(lhs, rhs, true)) return false;
{
return false;
}
return !(rhs < lhs);
} }
return !(rhs < lhs);
}
/// @brief comparison: less than or equal /// @brief comparison: less than or equal
/// @sa https://json.nlohmann.me/api/basic_json/operator_le/ /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
template<typename ScalarType, typename std::enable_if< template<typename ScalarType, typename std::enable_if<
std::is_scalar<ScalarType>::value, int>::type = 0> std::is_scalar<ScalarType>::value, int>::type = 0>
friend bool operator<=(const_reference lhs, ScalarType rhs) noexcept friend bool operator<=(const_reference lhs, ScalarType rhs) noexcept
{ {
return lhs <= basic_json(rhs); return lhs <= basic_json(rhs);
} }
/// @brief comparison: less than or equal /// @brief comparison: less than or equal
/// @sa https://json.nlohmann.me/api/basic_json/operator_le/ /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
template<typename ScalarType, typename std::enable_if< template<typename ScalarType, typename std::enable_if<
std::is_scalar<ScalarType>::value, int>::type = 0> std::is_scalar<ScalarType>::value, int>::type = 0>
friend bool operator<=(ScalarType lhs, const_reference rhs) noexcept friend bool operator<=(ScalarType lhs, const_reference rhs) noexcept
{ {
return basic_json(lhs) <= rhs; return basic_json(lhs) <= rhs;
} }
/// @brief comparison: greater than /// @brief comparison: greater than
/// @sa https://json.nlohmann.me/api/basic_json/operator_gt/ /// @sa https://json.nlohmann.me/api/basic_json/operator_gt/
friend bool operator>(const_reference lhs, const_reference rhs) noexcept friend bool operator>(const_reference lhs, const_reference rhs) noexcept
{
// double inverse
if (compares_unordered(lhs, rhs))
{ {
// double inverse return false;
if (compares_unordered(lhs, rhs))
{
return false;
}
return !(lhs <= rhs);
} }
return !(lhs <= rhs);
}
/// @brief comparison: greater than /// @brief comparison: greater than
/// @sa https://json.nlohmann.me/api/basic_json/operator_gt/ /// @sa https://json.nlohmann.me/api/basic_json/operator_gt/
template<typename ScalarType, typename std::enable_if< template<typename ScalarType, typename std::enable_if<
std::is_scalar<ScalarType>::value, int>::type = 0> std::is_scalar<ScalarType>::value, int>::type = 0>
friend bool operator>(const_reference lhs, ScalarType rhs) noexcept friend bool operator>(const_reference lhs, ScalarType rhs) noexcept
{ {
return lhs > basic_json(rhs); return lhs > basic_json(rhs);
} }
/// @brief comparison: greater than /// @brief comparison: greater than
/// @sa https://json.nlohmann.me/api/basic_json/operator_gt/ /// @sa https://json.nlohmann.me/api/basic_json/operator_gt/
template<typename ScalarType, typename std::enable_if< template<typename ScalarType, typename std::enable_if<
std::is_scalar<ScalarType>::value, int>::type = 0> std::is_scalar<ScalarType>::value, int>::type = 0>
friend bool operator>(ScalarType lhs, const_reference rhs) noexcept friend bool operator>(ScalarType lhs, const_reference rhs) noexcept
{ {
return basic_json(lhs) > rhs; return basic_json(lhs) > rhs;
} }
/// @brief comparison: greater than or equal /// @brief comparison: greater than or equal
/// @sa https://json.nlohmann.me/api/basic_json/operator_ge/ /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
friend bool operator>=(const_reference lhs, const_reference rhs) noexcept friend bool operator>=(const_reference lhs, const_reference rhs) noexcept
{
if (compares_unordered(lhs, rhs, true))
{ {
if (compares_unordered(lhs, rhs, true)) return false;
{
return false;
}
return !(lhs < rhs);
} }
return !(lhs < rhs);
}
/// @brief comparison: greater than or equal /// @brief comparison: greater than or equal
/// @sa https://json.nlohmann.me/api/basic_json/operator_ge/ /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
template<typename ScalarType, typename std::enable_if< template<typename ScalarType, typename std::enable_if<
std::is_scalar<ScalarType>::value, int>::type = 0> std::is_scalar<ScalarType>::value, int>::type = 0>
friend bool operator>=(const_reference lhs, ScalarType rhs) noexcept friend bool operator>=(const_reference lhs, ScalarType rhs) noexcept
{ {
return lhs >= basic_json(rhs); return lhs >= basic_json(rhs);
} }
/// @brief comparison: greater than or equal /// @brief comparison: greater than or equal
/// @sa https://json.nlohmann.me/api/basic_json/operator_ge/ /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
template<typename ScalarType, typename std::enable_if< template<typename ScalarType, typename std::enable_if<
std::is_scalar<ScalarType>::value, int>::type = 0> std::is_scalar<ScalarType>::value, int>::type = 0>
friend bool operator>=(ScalarType lhs, const_reference rhs) noexcept friend bool operator>=(ScalarType lhs, const_reference rhs) noexcept
{ {
return basic_json(lhs) >= rhs; return basic_json(lhs) >= rhs;
} }
#endif #endif
#undef JSON_IMPLEMENT_OPERATOR #undef JSON_IMPLEMENT_OPERATOR