github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-11-01 16:14:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed JsonVariant::as<unsigned>() (fixes #1601)

Browse Source
This commit is contained in:
Benoit Blanchon
2021-06-30 09:17:28 +02:00
parent fc4f175300
commit ef7579394b
5 changed files with 105 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ArduinoJson/Numbers/convertNumber.hpp
View File

@@ -71,9 +71,23 @@ canConvertNumber(TIn) {
}
// int32 -> uint32
// int32 -> uint64
template <typename TOut, typename TIn>
typename enable_if<is_integral<TIn>::value && is_signed<TIn>::value &&
is_integral<TOut>::value && is_unsigned<TOut>::value,
is_integral<TOut>::value && is_unsigned<TOut>::value &&
sizeof(TOut) >= sizeof(TIn),
bool>::type
canConvertNumber(TIn value) {
if (value < 0)
return false;
return TOut(value) <= numeric_limits<TOut>::highest();
}
// int32 -> uint16
template <typename TOut, typename TIn>
typename enable_if<is_integral<TIn>::value && is_signed<TIn>::value &&
is_integral<TOut>::value && is_unsigned<TOut>::value &&
sizeof(TOut) < sizeof(TIn),
bool>::type
canConvertNumber(TIn value) {
if (value < 0)