feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Swap the parameters of JsonArray's constructor

Browse Source
This commit is contained in:
Benoit Blanchon
2023-06-20 18:06:41 +02:00
parent 4c0fb4eb55
commit e96680eb29
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ArduinoJson/Array/JsonArray.hpp
View File

@ -24,8 +24,8 @@ class JsonArray : public detail::VariantOperators<JsonArray> {
FORCE_INLINE JsonArray() : data_(0), resources_(0) {} FORCE_INLINE JsonArray() : data_(0), resources_(0) {}
// INTERNAL USE ONLY // INTERNAL USE ONLY
FORCE_INLINE JsonArray(detail::ResourceManager* resources, FORCE_INLINE JsonArray(detail::CollectionData* data,
detail::CollectionData* data) detail::ResourceManager* resources)
: data_(data), resources_(resources) {} : data_(data), resources_(resources) {}
// Returns a JsonVariant pointing to the array. // Returns a JsonVariant pointing to the array.
@ -185,7 +185,7 @@ struct Converter<JsonArray> : private detail::VariantAttorney {
static JsonArray fromJson(JsonVariant src) { static JsonArray fromJson(JsonVariant src) {
auto data = getData(src); auto data = getData(src);
auto resources = getResourceManager(src); auto resources = getResourceManager(src);
return JsonArray(resources, data != 0 ? data->asArray() : 0); return JsonArray(data != 0 ? data->asArray() : 0, resources);
} }
static detail::InvalidConversion<JsonVariantConst, JsonArray> fromJson( static detail::InvalidConversion<JsonVariantConst, JsonArray> fromJson(
@ -209,8 +209,8 @@ template <typename TDerived>
template <typename T> template <typename T>
inline typename enable_if<is_same<T, JsonArray>::value, JsonArray>::type inline typename enable_if<is_same<T, JsonArray>::value, JsonArray>::type
VariantRefBase<TDerived>::to() const { VariantRefBase<TDerived>::to() const {
return JsonArray(getResourceManager(), return JsonArray(variantToArray(getOrCreateData(), getResourceManager()),
variantToArray(getOrCreateData(), getResourceManager())); getResourceManager());
} }
ARDUINOJSON_END_PRIVATE_NAMESPACE ARDUINOJSON_END_PRIVATE_NAMESPACE