bblanchon/ArduinoJson
1
0
Fork 1
mirror of https://github.com/bblanchon/ArduinoJson.git synced 2025-07-29 18:27:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Hide FreeSlot in MemoryPoolList

Browse Source
This commit is contained in:
Benoit Blanchon
2024-08-25 14:39:18 +02:00
parent cec18177b0
commit f7f1b9745d
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ArduinoJson/Memory/MemoryPoolImpl.hpp
View File

@ -69,12 +69,12 @@ inline SlotWithId MemoryPoolList::allocFromFreeList() {
ARDUINOJSON_ASSERT(freeList_ != NULL_SLOT);
auto id = freeList_;
auto slot = getSlot(freeList_);
freeList_ = slot->free.next;
freeList_ = reinterpret_cast<FreeSlot*>(slot)->next;
return {slot, id};
}
inline void MemoryPoolList::freeSlot(SlotWithId slot) {
slot->free.next = freeList_;
reinterpret_cast<FreeSlot*>(slot.slot())->next = freeList_;
freeList_ = slot.id();
}

4
src/ArduinoJson/Memory/MemoryPoolList.hpp
View File

@ -15,6 +15,10 @@ ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
using PoolCount = SlotId;
class MemoryPoolList {
struct FreeSlot {
SlotId next;
};
public:
MemoryPoolList() = default;

5
src/ArduinoJson/Variant/VariantSlot.hpp
View File

@ -13,15 +13,10 @@ ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
struct StringNode;
struct FreeSlot {
SlotId next;
};
union VariantSlot {
VariantSlot() {}
VariantData variant;
FreeSlot free;
};
ARDUINOJSON_END_PRIVATE_NAMESPACE