diff --git a/src/ArduinoJson/Array/ElementProxy.hpp b/src/ArduinoJson/Array/ElementProxy.hpp index aedb594c..e2256b08 100644 --- a/src/ArduinoJson/Array/ElementProxy.hpp +++ b/src/ArduinoJson/Array/ElementProxy.hpp @@ -52,7 +52,7 @@ class ElementProxy : public VariantRefBase>, VariantImpl getImpl() const { auto impl = VariantAttorney::getImpl(upstream_); - return VariantImpl(impl.getElement(index_), impl.getResourceManager()); + return VariantImpl(impl.getElement(index_), impl.resources()); } VariantImpl getOrCreateImpl() const { @@ -60,7 +60,7 @@ class ElementProxy : public VariantRefBase>, auto data = impl.data(); if (data) data->getOrCreateArray(); - return VariantImpl(impl.getOrAddElement(index_), impl.getResourceManager()); + return VariantImpl(impl.getOrAddElement(index_), impl.resources()); } TUpstream upstream_; diff --git a/src/ArduinoJson/Array/JsonArray.hpp b/src/ArduinoJson/Array/JsonArray.hpp index 3b00d8df..ce2abaf2 100644 --- a/src/ArduinoJson/Array/JsonArray.hpp +++ b/src/ArduinoJson/Array/JsonArray.hpp @@ -52,7 +52,7 @@ class JsonArray : public detail::VariantOperators { template ::value, int> = 0> JsonVariant add() const { - return JsonVariant(impl_.addElement(), impl_.getResourceManager()); + return JsonVariant(impl_.addElement(), impl_.resources()); } // Appends a value to the array. diff --git a/src/ArduinoJson/Array/JsonArrayConst.hpp b/src/ArduinoJson/Array/JsonArrayConst.hpp index 869ca462..7caefcb2 100644 --- a/src/ArduinoJson/Array/JsonArrayConst.hpp +++ b/src/ArduinoJson/Array/JsonArrayConst.hpp @@ -44,8 +44,7 @@ class JsonArrayConst : public detail::VariantOperators { template ::value, int> = 0> JsonVariantConst operator[](T index) const { - return JsonVariantConst(impl_.getElement(size_t(index)), - impl_.getResourceManager()); + return JsonVariantConst(impl_.getElement(size_t(index)), impl_.resources()); } // Returns the element at the specified index. diff --git a/src/ArduinoJson/Collection/CollectionIterator.hpp b/src/ArduinoJson/Collection/CollectionIterator.hpp index bd1a4968..b0496070 100644 --- a/src/ArduinoJson/Collection/CollectionIterator.hpp +++ b/src/ArduinoJson/Collection/CollectionIterator.hpp @@ -25,7 +25,7 @@ class CollectionIterator { void next() { ARDUINOJSON_ASSERT(!done()); auto nextId = value_.data()->next; - auto resources = value_.getResourceManager(); + auto resources = value_.resources(); value_ = VariantImpl(resources->getVariant(nextId), resources); currentId_ = nextId; } diff --git a/src/ArduinoJson/Deserialization/deserialize.hpp b/src/ArduinoJson/Deserialization/deserialize.hpp index 05c77f97..d042f2b3 100644 --- a/src/ArduinoJson/Deserialization/deserialize.hpp +++ b/src/ArduinoJson/Deserialization/deserialize.hpp @@ -47,7 +47,7 @@ DeserializationError doDeserialize(TDestination&& dst, TReader reader, auto impl = VariantAttorney::getOrCreateImpl(dst); if (impl.isUnbound()) return DeserializationError::NoMemory; - auto resources = impl.getResourceManager(); + auto resources = impl.resources(); dst.clear(); auto err = TDeserializer(resources, reader) .parse(impl.data(), options.filter, options.nestingLimit); diff --git a/src/ArduinoJson/MsgPack/MsgPackBinary.hpp b/src/ArduinoJson/MsgPack/MsgPackBinary.hpp index c6ddcf69..a6390ef8 100644 --- a/src/ArduinoJson/MsgPack/MsgPackBinary.hpp +++ b/src/ArduinoJson/MsgPack/MsgPackBinary.hpp @@ -29,7 +29,7 @@ struct Converter : private detail::VariantAttorney { auto data = impl.data(); if (!data) return; - auto resources = impl.getResourceManager(); + auto resources = impl.resources(); impl.clear(); if (src.data()) { size_t headerSize = src.size() >= 0x10000 ? 5 diff --git a/src/ArduinoJson/MsgPack/MsgPackExtension.hpp b/src/ArduinoJson/MsgPack/MsgPackExtension.hpp index f15335ce..59326685 100644 --- a/src/ArduinoJson/MsgPack/MsgPackExtension.hpp +++ b/src/ArduinoJson/MsgPack/MsgPackExtension.hpp @@ -33,7 +33,7 @@ struct Converter : private detail::VariantAttorney { static void toJson(MsgPackExtension src, JsonVariant dst) { auto impl = getImpl(dst); auto data = impl.data(); - auto resources = impl.getResourceManager(); + auto resources = impl.resources(); if (!data) return; impl.clear(); diff --git a/src/ArduinoJson/Object/JsonObjectConst.hpp b/src/ArduinoJson/Object/JsonObjectConst.hpp index 19caf34d..dac191dc 100644 --- a/src/ArduinoJson/Object/JsonObjectConst.hpp +++ b/src/ArduinoJson/Object/JsonObjectConst.hpp @@ -96,7 +96,7 @@ class JsonObjectConst : public detail::VariantOperators { detail::enable_if_t::value, int> = 0> JsonVariantConst operator[](const TString& key) const { return JsonVariantConst(impl_.getMember(detail::adaptString(key)), - impl_.getResourceManager()); + impl_.resources()); } // Gets the member with specified key. @@ -107,7 +107,7 @@ class JsonObjectConst : public detail::VariantOperators { int> = 0> JsonVariantConst operator[](TChar* key) const { return JsonVariantConst(impl_.getMember(detail::adaptString(key)), - impl_.getResourceManager()); + impl_.resources()); } // Gets the member with specified key. diff --git a/src/ArduinoJson/Object/MemberProxy.hpp b/src/ArduinoJson/Object/MemberProxy.hpp index 91c19def..2649177c 100644 --- a/src/ArduinoJson/Object/MemberProxy.hpp +++ b/src/ArduinoJson/Object/MemberProxy.hpp @@ -53,7 +53,7 @@ class MemberProxy VariantImpl getImpl() const { auto impl = VariantAttorney::getImpl(upstream_); - return VariantImpl(impl.getMember(key_), impl.getResourceManager()); + return VariantImpl(impl.getMember(key_), impl.resources()); } VariantImpl getOrCreateImpl() const { @@ -61,7 +61,7 @@ class MemberProxy auto data = impl.data(); if (data) data->getOrCreateObject(); - return VariantImpl(impl.getOrAddMember(key_), impl.getResourceManager()); + return VariantImpl(impl.getOrAddMember(key_), impl.resources()); } private: diff --git a/src/ArduinoJson/Serialization/measure.hpp b/src/ArduinoJson/Serialization/measure.hpp index 6d83d9ba..0ae6ee65 100644 --- a/src/ArduinoJson/Serialization/measure.hpp +++ b/src/ArduinoJson/Serialization/measure.hpp @@ -12,7 +12,7 @@ template