ResourceManager: decouple from VariantImpl

bblanchon · bblanchon · commit b7e0d7366bd7 · 2025-07-14T19:13:31.000+02:00
diff --git a/src/ArduinoJson/Memory/ResourceManagerImpl.hpp b/src/ArduinoJson/Memory/ResourceManagerImpl.hpp
@@ -6,7 +6,6 @@
 
 #include <ArduinoJson/Memory/ResourceManager.hpp>
 #include <ArduinoJson/Polyfills/alias_cast.hpp>
-#include <ArduinoJson/Variant/VariantImpl.hpp>
 
 ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
 
@@ -21,7 +20,6 @@ inline Slot<VariantData> ResourceManager::allocVariant() {
 }
 
 inline void ResourceManager::freeVariant(Slot<VariantData> slot) {
-  VariantImpl(slot.ptr(), this).clear();
   variantPools_.freeSlot(slot);
 }
 
diff --git a/src/ArduinoJson/Variant/VariantImpl.hpp b/src/ArduinoJson/Variant/VariantImpl.hpp
@@ -548,6 +548,7 @@ class VariantImpl {
 
   void freeVariant(Slot<VariantData> slot) {
     ARDUINOJSON_ASSERT(resources_ != nullptr);
+    VariantImpl(slot.ptr(), resources_).clear();
     resources_->freeVariant(slot);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`
`7`	`7`	`#include <ArduinoJson/Memory/ResourceManager.hpp>`
`8`	`8`	`#include <ArduinoJson/Polyfills/alias_cast.hpp>`
`9`		`-#include <ArduinoJson/Variant/VariantImpl.hpp>`
`10`	`9`
`11`	`10`	`ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE`
`12`	`11`
`@@ -21,7 +20,6 @@ inline Slot<VariantData> ResourceManager::allocVariant() {`
`21`	`20`	`}`
`22`	`21`
`23`	`22`	`inline void ResourceManager::freeVariant(Slot<VariantData> slot) {`
`24`		`- VariantImpl(slot.ptr(), this).clear();`
`25`	`23`	`variantPools_.freeSlot(slot);`
`26`	`24`	`}`
`27`	`25`
Original file line number	Diff line number	Diff line change
`@@ -548,6 +548,7 @@ class VariantImpl {`
`548`	`548`
`549`	`549`	`void freeVariant(Slot<VariantData> slot) {`
`550`	`550`	`ARDUINOJSON_ASSERT(resources_ != nullptr);`
	`551`	`+ VariantImpl(slot.ptr(), resources_).clear();`
`551`	`552`	`resources_->freeVariant(slot);`
`552`	`553`	`}`
`553`	`554`