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

Fixed object keys not being duplicated

Browse Source
This commit is contained in:
Benoit Blanchon
2018-10-04 11:16:23 +02:00
parent 527dc19794
commit 6b985b2d1f
30 changed files with 368 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/ArduinoJson/JsonVariant.hpp
View File

@@ -125,32 +125,14 @@ class JsonVariant : public JsonVariantBase<JsonVariant> {
template <typename T>
FORCE_INLINE bool set(const T &value,
typename enable_if<IsString<T>::value>::type * = 0) {
if (!_data) return false;
const char *dup = makeString(value).save(_memoryPool);
if (dup) {
_data->type = JSON_OWNED_STRING;
_data->content.asString = dup;
return true;
} else {
_data->type = JSON_NULL;
return false;
}
return setString(makeString(value));
}
// set(char*)
template <typename T>
FORCE_INLINE bool set(T *value,
typename enable_if<IsString<T *>::value>::type * = 0) {
if (!_data) return false;
const char *dup = makeString(value).save(_memoryPool);
if (dup) {
_data->type = JSON_OWNED_STRING;
_data->content.asString = dup;
return true;
} else {
_data->type = JSON_NULL;
return false;
}
return setString(makeString(value));
}
// set(const char*);
@@ -161,6 +143,14 @@ class JsonVariant : public JsonVariantBase<JsonVariant> {
return true;
}
// set(const char*);
FORCE_INLINE bool set(StringInMemoryPool value) {
if (!_data) return false;
_data->type = JSON_OWNED_STRING;
_data->content.asString = value.save(_memoryPool);
return true;
}
bool set(const JsonVariant &value);
FORCE_INLINE bool set(JsonArray array);
@@ -367,6 +357,20 @@ class JsonVariant : public JsonVariantBase<JsonVariant> {
typename enable_if<is_same<T, JsonVariant>::value, JsonVariant>::type to();
private:
template <typename TStringRef>
bool setString(TStringRef value) {
if (!_data) return false;
const char *dup = value.save(_memoryPool);
if (dup) {
_data->type = JSON_OWNED_STRING;
_data->content.asString = dup;
return true;
} else {
_data->type = JSON_NULL;
return false;
}
}
MemoryPool *_memoryPool;
JsonVariantData *_data;
};