From 0f3c73a211b197229f466cbc84c546825f08db8e Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Mon, 17 Jul 2023 21:08:49 +0200 Subject: [PATCH] Remove `VariantPool::capacity()` --- src/ArduinoJson/Memory/ResourceManager.hpp | 5 ----- src/ArduinoJson/Memory/VariantPool.hpp | 1 - src/ArduinoJson/Memory/VariantPoolImpl.hpp | 4 ---- src/ArduinoJson/Memory/VariantPoolList.hpp | 7 ------- 4 files changed, 17 deletions(-) diff --git a/src/ArduinoJson/Memory/ResourceManager.hpp b/src/ArduinoJson/Memory/ResourceManager.hpp index 953df339..03d8d00a 100644 --- a/src/ArduinoJson/Memory/ResourceManager.hpp +++ b/src/ArduinoJson/Memory/ResourceManager.hpp @@ -43,11 +43,6 @@ class ResourceManager { return allocator_; } - // Gets the capacity of the memoryPool in bytes - size_t capacity() const { - return VariantPool::slotsToBytes(variantPools_.capacity()); - } - size_t size() const { return VariantPool::slotsToBytes(variantPools_.usage()) + stringPool_.size(); diff --git a/src/ArduinoJson/Memory/VariantPool.hpp b/src/ArduinoJson/Memory/VariantPool.hpp index ef40cc87..6dad82c2 100644 --- a/src/ArduinoJson/Memory/VariantPool.hpp +++ b/src/ArduinoJson/Memory/VariantPool.hpp @@ -49,7 +49,6 @@ class VariantPool { VariantSlot* getSlot(SlotId id) const; void clear(); void shrinkToFit(Allocator*); - SlotCount capacity() const; SlotCount usage() const; static SlotCount bytesToSlots(size_t); diff --git a/src/ArduinoJson/Memory/VariantPoolImpl.hpp b/src/ArduinoJson/Memory/VariantPoolImpl.hpp index 8e173878..1d3461e1 100644 --- a/src/ArduinoJson/Memory/VariantPoolImpl.hpp +++ b/src/ArduinoJson/Memory/VariantPoolImpl.hpp @@ -49,10 +49,6 @@ inline SlotCount VariantPool::usage() const { return usage_; } -inline SlotCount VariantPool::capacity() const { - return capacity_; -} - inline void VariantPool::clear() { usage_ = 0; } diff --git a/src/ArduinoJson/Memory/VariantPoolList.hpp b/src/ArduinoJson/Memory/VariantPoolList.hpp index 7a6000ce..80eafa52 100644 --- a/src/ArduinoJson/Memory/VariantPoolList.hpp +++ b/src/ArduinoJson/Memory/VariantPoolList.hpp @@ -63,13 +63,6 @@ class VariantPoolList { capacity_ = 0; } - SlotCount capacity() const { - SlotCount total = 0; - for (size_t i = 0; i < count_; i++) - total = SlotCount(total + pools_[i].capacity()); - return total; - } - SlotCount usage() const { SlotCount total = 0; for (size_t i = 0; i < count_; i++)