diff --git a/src/ArduinoJson/Object/JsonObject.hpp b/src/ArduinoJson/Object/JsonObject.hpp index 565c9bad..345819e2 100644 --- a/src/ArduinoJson/Object/JsonObject.hpp +++ b/src/ArduinoJson/Object/JsonObject.hpp @@ -23,9 +23,9 @@ class JsonObject : public detail::VariantOperators { FORCE_INLINE JsonObject() : data_(0), resources_(0) {} // INTERNAL USE ONLY - FORCE_INLINE JsonObject(detail::ResourceManager* buf, - detail::CollectionData* data) - : data_(data), resources_(buf) {} + FORCE_INLINE JsonObject(detail::CollectionData* data, + detail::ResourceManager* resource) + : data_(data), resources_(resource) {} operator JsonVariant() const { void* data = data_; // prevent warning cast-align @@ -219,7 +219,7 @@ struct Converter : private detail::VariantAttorney { static JsonObject fromJson(JsonVariant src) { auto data = getData(src); auto resources = getResourceManager(src); - return JsonObject(resources, data != 0 ? data->asObject() : 0); + return JsonObject(data != 0 ? data->asObject() : 0, resources); } static detail::InvalidConversion fromJson( @@ -243,8 +243,8 @@ template template typename enable_if::value, JsonObject>::type VariantRefBase::to() const { - return JsonObject(getResourceManager(), - variantToObject(getOrCreateData(), getResourceManager())); + return JsonObject(variantToObject(getOrCreateData(), getResourceManager()), + getResourceManager()); } ARDUINOJSON_END_PRIVATE_NAMESPACE