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

Attach copy policy to string adapters

Browse Source
This commit is contained in:
Benoit Blanchon
2022-10-26 10:37:18 +02:00
parent 61c6f8ba59
commit b27990f780
12 changed files with 113 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ArduinoJson/Variant/ConverterImpl.hpp
View File

@@ -118,8 +118,7 @@ struct Converter<T, typename enable_if<is_floating_point<T>::value>::type>
template <>
struct Converter<const char*> : private VariantAttorney {
static void toJson(const char* src, VariantRef dst) {
variantSetString(getData(dst), adaptString(src), getPool(dst),
getStringStoragePolicy(src));
variantSetString(getData(dst), adaptString(src), getPool(dst));
}
static const char* fromJson(VariantConstRef src) {
@@ -136,8 +135,7 @@ struct Converter<const char*> : private VariantAttorney {
template <>
struct Converter<String> : private VariantAttorney {
static void toJson(String src, VariantRef dst) {
variantSetString(getData(dst), adaptString(src), getPool(dst),
getStringStoragePolicy(src));
variantSetString(getData(dst), adaptString(src), getPool(dst));
}
static String fromJson(VariantConstRef src) {
@@ -156,8 +154,7 @@ inline typename enable_if<IsString<T>::value, bool>::type convertToJson(
const T& src, VariantRef dst) {
VariantData* data = VariantAttorney::getData(dst);
MemoryPool* pool = VariantAttorney::getPool(dst);
return variantSetString(data, adaptString(src), pool,
getStringStoragePolicy(src));
return variantSetString(data, adaptString(src), pool);
}
template <>