update to 16.18.4

This commit is contained in:
proddy
2021-09-19 21:26:15 +02:00
parent adebea1561
commit 079a40cd32
10 changed files with 27 additions and 21 deletions

View File

@@ -32,8 +32,8 @@ class Filter {
Filter operator[](const TKey& key) const {
if (_variant == true) // "true" means "allow recursively"
return *this;
else
return Filter(_variant[key] | _variant["*"]);
VariantConstRef member = _variant[key];
return Filter(member.isNull() ? _variant["*"] : member);
}
private:

View File

@@ -17,7 +17,7 @@ struct Reader {
Reader(TSource& source) : _source(&source) {}
int read() {
return _source->read();
return _source->read(); // Error here? You passed an unsupported input type
}
size_t readBytes(char* buffer, size_t length) {

View File

@@ -13,14 +13,14 @@ template <typename TStringBuilder>
inline void encodeCodepoint(uint32_t codepoint32, TStringBuilder& str) {
// this function was optimize for code size on AVR
// a buffer to store the string in reverse
char buf[5];
char* p = buf;
*(p++) = 0;
if (codepoint32 < 0x80) {
*(p++) = char((codepoint32));
str.append(char(codepoint32));
} else {
// a buffer to store the string in reverse
char buf[5];
char* p = buf;
*(p++) = 0;
*(p++) = char((codepoint32 | 0x80) & 0xBF);
uint16_t codepoint16 = uint16_t(codepoint32 >> 6);
if (codepoint16 < 0x20) { // 0x800
@@ -36,10 +36,10 @@ inline void encodeCodepoint(uint32_t codepoint32, TStringBuilder& str) {
*(p++) = char(codepoint16 | 0xF0);
}
}
}
while (*(--p)) {
str.append(*p);
while (*(--p)) {
str.append(*p);
}
}
}
} // namespace Utf8

View File

@@ -45,8 +45,7 @@ class StringAdapter< ::String> {
template <>
class StringAdapter< ::StringSumHelper> : public StringAdapter< ::String> {
public:
StringAdapter< ::StringSumHelper>(const ::String& s)
: StringAdapter< ::String>(s) {}
StringAdapter(const ::String& s) : StringAdapter< ::String>(s) {}
};
} // namespace ARDUINOJSON_NAMESPACE

View File

@@ -45,7 +45,7 @@ class StringAdapter<const char*> {
template <int N>
class StringAdapter<const char[N]> : public StringAdapter<const char*> {
public:
StringAdapter<const char[N]>(const char* s) : StringAdapter<const char*>(s) {}
StringAdapter(const char* s) : StringAdapter<const char*>(s) {}
};
} // namespace ARDUINOJSON_NAMESPACE

View File

@@ -27,7 +27,7 @@ struct Converter {
}
static bool checkJson(VariantConstRef src) {
T dummy;
T dummy = T();
// clang-format off
return canConvertFromJson(src, dummy); // Error here? See https://arduinojson.org/v6/unsupported-is/
// clang-format on

View File

@@ -12,7 +12,6 @@
namespace ARDUINOJSON_NAMESPACE {
//
enum {
VALUE_MASK = 0x7F,

View File

@@ -4,7 +4,7 @@
#pragma once
#define ARDUINOJSON_VERSION "6.18.3"
#define ARDUINOJSON_VERSION "6.18.4"
#define ARDUINOJSON_VERSION_MAJOR 6
#define ARDUINOJSON_VERSION_MINOR 18
#define ARDUINOJSON_VERSION_REVISION 3
#define ARDUINOJSON_VERSION_REVISION 4