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

Amalgamated

Browse Source
This commit is contained in:
Aviral Singh 2023-07-17 18:58:06 +05:30
parent 63152c59aa
commit f11c36642e
16 changed files with 1224 additions and 1224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/nlohmann/detail/conversions/from_json.hpp
View File

@ -262,8 +262,8 @@ template < typename BasicJsonType, typename ConstructibleArrayType,
int > = 0 >
auto from_json(const BasicJsonType& j, ConstructibleArrayType& arr)
-> decltype(from_json_array_impl(j, arr, priority_tag<3> {}),
j.template get<typename ConstructibleArrayType::value_type>(),
void())
j.template get<typename ConstructibleArrayType::value_type>(),
void())
{
if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
{

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

@ -417,7 +417,7 @@ is_detected<range_value_t, ConstructibleArrayType>::value&&
!std::is_same<ConstructibleArrayType, detected_t<range_value_t, ConstructibleArrayType>>::value&&
is_complete_type <
detected_t<range_value_t, ConstructibleArrayType >>::value >>
{
{
using value_type = range_value_t<ConstructibleArrayType>;
static constexpr bool value =
@ -428,7 +428,7 @@ is_detected<range_value_t, ConstructibleArrayType>::value&&
has_non_default_from_json <
BasicJsonType,
value_type >::value;
};
};
template<typename BasicJsonType, typename ConstructibleArrayType>
struct is_constructible_array_type
@ -511,7 +511,7 @@ template<typename Compare, typename A, typename B>
struct is_comparable<Compare, A, B, void_t<
decltype(std::declval<Compare>()(std::declval<A>(), std::declval<B>())),
decltype(std::declval<Compare>()(std::declval<B>(), std::declval<A>()))
>> : std::true_type {};
>> : std::true_type {};
template<typename T>
using detect_is_transparent = typename T::is_transparent;

10
include/nlohmann/json.hpp
View File

@ -579,7 +579,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
else
{
stack.reserve(object->size());
for (auto&& it : *object)
for (auto && it : *object)
{
stack.push_back(std::move(it.second));
}
@ -601,7 +601,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
}
else if (current_item.is_object())
{
for (auto&& it : *current_item.m_data.m_value.object)
for (auto && it : *current_item.m_data.m_value.object)
{
stack.push_back(std::move(it.second));
}
@ -5218,14 +5218,14 @@ struct less< ::nlohmann::detail::value_t> // do not remove the space after '<',
*/
bool operator()(::nlohmann::detail::value_t lhs,
::nlohmann::detail::value_t rhs) const noexcept
{
{
#if JSON_HAS_THREE_WAY_COMPARISON
return std::is_lt(lhs <=> rhs); // *NOPAD*
#else
return ::nlohmann::detail::operator<(lhs, rhs);
#endif
}
};
}
};
// C++20 prohibit function specialization in the std namespace.
#ifndef JSON_HAS_CPP_20

20
single_include/nlohmann/json.hpp
View File

@ -3817,7 +3817,7 @@ is_detected<range_value_t, ConstructibleArrayType>::value&&
!std::is_same<ConstructibleArrayType, detected_t<range_value_t, ConstructibleArrayType>>::value&&
is_complete_type <
detected_t<range_value_t, ConstructibleArrayType >>::value >>
{
{
using value_type = range_value_t<ConstructibleArrayType>;
static constexpr bool value =
@ -3828,7 +3828,7 @@ is_detected<range_value_t, ConstructibleArrayType>::value&&
has_non_default_from_json <
BasicJsonType,
value_type >::value;
};
};
template<typename BasicJsonType, typename ConstructibleArrayType>
struct is_constructible_array_type
@ -3911,7 +3911,7 @@ template<typename Compare, typename A, typename B>
struct is_comparable<Compare, A, B, void_t<
decltype(std::declval<Compare>()(std::declval<A>(), std::declval<B>())),
decltype(std::declval<Compare>()(std::declval<B>(), std::declval<A>()))
>> : std::true_type {};
>> : std::true_type {};
template<typename T>
using detect_is_transparent = typename T::is_transparent;
@ -4822,8 +4822,8 @@ template < typename BasicJsonType, typename ConstructibleArrayType,
int > = 0 >
auto from_json(const BasicJsonType& j, ConstructibleArrayType& arr)
-> decltype(from_json_array_impl(j, arr, priority_tag<3> {}),
j.template get<typename ConstructibleArrayType::value_type>(),
void())
j.template get<typename ConstructibleArrayType::value_type>(),
void())
{
if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
{
@ -19799,7 +19799,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
else
{
stack.reserve(object->size());
for (auto&& it : *object)
for (auto && it : *object)
{
stack.push_back(std::move(it.second));
}
@ -19821,7 +19821,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
}
else if (current_item.is_object())
{
for (auto&& it : *current_item.m_data.m_value.object)
for (auto && it : *current_item.m_data.m_value.object)
{
stack.push_back(std::move(it.second));
}
@ -24438,14 +24438,14 @@ struct less< ::nlohmann::detail::value_t> // do not remove the space after '<',
*/
bool operator()(::nlohmann::detail::value_t lhs,
::nlohmann::detail::value_t rhs) const noexcept
{
{
#if JSON_HAS_THREE_WAY_COMPARISON
return std::is_lt(lhs <=> rhs); // *NOPAD*
#else
return ::nlohmann::detail::operator<(lhs, rhs);
#endif
}
};
}
};
// C++20 prohibit function specialization in the std namespace.
#ifndef JSON_HAS_CPP_20