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

Change VariantData::asString() return type to JsonString

Browse Source
This commit is contained in:
Benoit Blanchon
2021-10-24 09:55:28 +02:00
parent acfa174333
commit a7873389c6
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,7 +120,7 @@ struct Converter<const char*> {
static const char* fromJson(VariantConstRef src) {
const VariantData* data = getData(src);
return data ? data->asString() : 0;
return data ? data->asString().c_str() : 0;
}
static bool checkJson(VariantConstRef src) {
@@ -137,7 +137,7 @@ struct Converter<String> {
static String fromJson(VariantConstRef src) {
const VariantData* data = getData(src);
return data ? String(data->asString(), false) : 0;
return data ? data->asString() : 0;
}
static bool checkJson(VariantConstRef src) {
@@ -158,9 +158,9 @@ template <typename T>
inline typename enable_if<IsWriteableString<T>::value>::type convertFromJson(
VariantConstRef src, T& dst) {
const VariantData* data = getData(src);
const char* cstr = data != 0 ? data->asString() : 0;
if (cstr)
dst = cstr;
String str = data != 0 ? data->asString() : 0;
if (str)
dst = str.c_str();
else
serializeJson(src, dst);
}