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

Replace CopiedString and LinkedString with JsonString

Browse Source
This commit is contained in:
Benoit Blanchon
2022-01-13 16:15:53 +01:00
parent 973858b835
commit 4f6244eef4
11 changed files with 26 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ArduinoJson/Variant/VariantSlot.hpp
View File

@@ -7,7 +7,6 @@
#include <ArduinoJson/Polyfills/integer.hpp>
#include <ArduinoJson/Polyfills/limits.hpp>
#include <ArduinoJson/Polyfills/type_traits.hpp>
#include <ArduinoJson/Strings/StoredString.hpp>
#include <ArduinoJson/Variant/VariantContent.hpp>
namespace ARDUINOJSON_NAMESPACE {
@@ -77,15 +76,12 @@ class VariantSlot {
_next = VariantSlotDiff(slot - this);
}
void setKey(CopiedString k) {
void setKey(String k) {
ARDUINOJSON_ASSERT(k);
_flags |= OWNED_KEY_BIT;
_key = k.c_str();
}
void setKey(LinkedString k) {
ARDUINOJSON_ASSERT(k);
_flags &= VALUE_MASK;
if (k.isStatic())
_flags &= VALUE_MASK;
else
_flags |= OWNED_KEY_BIT;
_key = k.c_str();
}