From e96680eb29c6712860c96362aa4ef7320676039a Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Tue, 20 Jun 2023 18:06:41 +0200 Subject: [PATCH] Swap the parameters of `JsonArray`'s constructor --- src/ArduinoJson/Array/JsonArray.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ArduinoJson/Array/JsonArray.hpp b/src/ArduinoJson/Array/JsonArray.hpp index e727dc45..813cbbc0 100644 --- a/src/ArduinoJson/Array/JsonArray.hpp +++ b/src/ArduinoJson/Array/JsonArray.hpp @@ -24,8 +24,8 @@ class JsonArray : public detail::VariantOperators { FORCE_INLINE JsonArray() : data_(0), resources_(0) {} // INTERNAL USE ONLY - FORCE_INLINE JsonArray(detail::ResourceManager* resources, - detail::CollectionData* data) + FORCE_INLINE JsonArray(detail::CollectionData* data, + detail::ResourceManager* resources) : data_(data), resources_(resources) {} // Returns a JsonVariant pointing to the array. @@ -185,7 +185,7 @@ struct Converter : private detail::VariantAttorney { static JsonArray fromJson(JsonVariant src) { auto data = getData(src); auto resources = getResourceManager(src); - return JsonArray(resources, data != 0 ? data->asArray() : 0); + return JsonArray(data != 0 ? data->asArray() : 0, resources); } static detail::InvalidConversion fromJson( @@ -209,8 +209,8 @@ template template inline typename enable_if::value, JsonArray>::type VariantRefBase::to() const { - return JsonArray(getResourceManager(), - variantToArray(getOrCreateData(), getResourceManager())); + return JsonArray(variantToArray(getOrCreateData(), getResourceManager()), + getResourceManager()); } ARDUINOJSON_END_PRIVATE_NAMESPACE