lib/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-08-06 07:02:42 +03:00
Code Activity

🚨 avoid deprecation warning

Browse Source 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann
2025-05-21 12:04:05 +02:00
parent 2d9a251266
commit 086abb5713
2 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/nlohmann/detail/meta/type_traits.hpp
View File

@@ -585,14 +585,29 @@ struct is_specialization_of<Primary, Primary<Args...>> : std::true_type {};
template<typename T> template<typename T>
using is_json_pointer = is_specialization_of<::nlohmann::json_pointer, uncvref_t<T>>; using is_json_pointer = is_specialization_of<::nlohmann::json_pointer, uncvref_t<T>>;
// checks if B is a json_pointer<A>
template <typename A, typename B>
struct is_json_pointer_of : std::false_type {};
template <typename A>
struct is_json_pointer_of<A, ::nlohmann::json_pointer<A>> : std::true_type {};
template <typename A>
struct is_json_pointer_of<A, ::nlohmann::json_pointer<A>&> : std::true_type {};
// checks if A and B are comparable using Compare functor // checks if A and B are comparable using Compare functor
template<typename Compare, typename A, typename B, typename = void> template<typename Compare, typename A, typename B, typename = void>
struct is_comparable : std::false_type {}; struct is_comparable : std::false_type {};
// We exclude json_pointer here, because the checks using Compare(A, B) will
// use json_pointer::operator string_t() which triggers a deprecation warning
// for GCC. See https://github.com/nlohmann/json/issues/4621. The call to
// is_json_pointer_of can be removed once the deprecated function has been
// removed.
template<typename Compare, typename A, typename B> template<typename Compare, typename A, typename B>
struct is_comparable<Compare, A, B, void_t< struct is_comparable < Compare, A, B, enable_if_t < !is_json_pointer_of<A, B>::value
decltype(std::declval<Compare>()(std::declval<A>(), std::declval<B>())), && std::is_constructible <decltype(std::declval<Compare>()(std::declval<A>(), std::declval<B>()))>::value
decltype(std::declval<Compare>()(std::declval<B>(), std::declval<A>())) && std::is_constructible <decltype(std::declval<Compare>()(std::declval<B>(), std::declval<A>()))>::value
>> : std::true_type {}; >> : std::true_type {};
template<typename T> template<typename T>

21
single_include/nlohmann/json.hpp
View File

@@ -4128,14 +4128,29 @@ struct is_specialization_of<Primary, Primary<Args...>> : std::true_type {};
template<typename T> template<typename T>
using is_json_pointer = is_specialization_of<::nlohmann::json_pointer, uncvref_t<T>>; using is_json_pointer = is_specialization_of<::nlohmann::json_pointer, uncvref_t<T>>;
// checks if B is a json_pointer<A>
template <typename A, typename B>
struct is_json_pointer_of : std::false_type {};
template <typename A>
struct is_json_pointer_of<A, ::nlohmann::json_pointer<A>> : std::true_type {};
template <typename A>
struct is_json_pointer_of<A, ::nlohmann::json_pointer<A>&> : std::true_type {};
// checks if A and B are comparable using Compare functor // checks if A and B are comparable using Compare functor
template<typename Compare, typename A, typename B, typename = void> template<typename Compare, typename A, typename B, typename = void>
struct is_comparable : std::false_type {}; struct is_comparable : std::false_type {};
// We exclude json_pointer here, because the checks using Compare(A, B) will
// use json_pointer::operator string_t() which triggers a deprecation warning
// for GCC. See https://github.com/nlohmann/json/issues/4621. The call to
// is_json_pointer_of can be removed once the deprecated function has been
// removed.
template<typename Compare, typename A, typename B> template<typename Compare, typename A, typename B>
struct is_comparable<Compare, A, B, void_t< struct is_comparable < Compare, A, B, enable_if_t < !is_json_pointer_of<A, B>::value
decltype(std::declval<Compare>()(std::declval<A>(), std::declval<B>())), && std::is_constructible <decltype(std::declval<Compare>()(std::declval<A>(), std::declval<B>()))>::value
decltype(std::declval<Compare>()(std::declval<B>(), std::declval<A>())) && std::is_constructible <decltype(std::declval<Compare>()(std::declval<B>(), std::declval<A>()))>::value
>> : std::true_type {}; >> : std::true_type {};
template<typename T> template<typename T>