bblanchon/ArduinoJson
1
0
Fork 1
mirror of https://github.com/bblanchon/ArduinoJson.git synced 2025-07-29 18:27:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reversed parameters of convertToJson() and convertFromJson()

Browse Source 
Now the order matches copyArray(): source first, destination second.
This commit is contained in:
Benoit Blanchon
2021-04-27 19:28:36 +02:00
parent 526cad54d7
commit 337864618c
8 changed files with 130 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
extras/tests/JsonVariant/converters.cpp
View File

@ -13,22 +13,22 @@ struct Date {
int year;
};
bool convertToJson(JsonVariant variant, const Date& date) {
variant["day"] = date.day;
variant["month"] = date.month;
variant["year"] = date.year;
bool convertToJson(const Date& src, JsonVariant dst) {
dst["day"] = src.day;
dst["month"] = src.month;
dst["year"] = src.year;
return true;
}
void convertFromJson(Date& date, JsonVariantConst variant) {
date.day = variant["day"];
date.month = variant["month"];
date.year = variant["year"];
void convertFromJson(JsonVariantConst src, Date& dst) {
dst.day = src["day"];
dst.month = src["month"];
dst.year = src["year"];
}
bool canConvertFromJson(Date&, JsonVariantConst variant) {
return variant["day"].is<int>() && variant["month"].is<int>() &&
variant["year"].is<int>();
bool canConvertFromJson(JsonVariantConst src, const Date&) {
return src["day"].is<int>() && src["month"].is<int>() &&
src["year"].is<int>();
}
} // namespace
@ -92,18 +92,18 @@ class Complex {
namespace ARDUINOJSON_NAMESPACE {
template <>
struct Converter<Complex> {
static bool toJson(VariantRef variant, const Complex& value) {
variant["real"] = value.real();
variant["imag"] = value.imag();
static bool toJson(const Complex& src, VariantRef dst) {
dst["real"] = src.real();
dst["imag"] = src.imag();
return true;
}
static Complex fromJson(VariantConstRef variant) {
return Complex(variant["real"], variant["imag"]);
static Complex fromJson(VariantConstRef src) {
return Complex(src["real"], src["imag"]);
}
static bool checkJson(VariantConstRef variant) {
return variant["real"].is<double>() && variant["imag"].is<double>();
static bool checkJson(VariantConstRef src) {
return src["real"].is<double>() && src["imag"].is<double>();
}
};
} // namespace ARDUINOJSON_NAMESPACE