From 870fffcdf01ae41e8d9924fc3984283b70d0b7e2 Mon Sep 17 00:00:00 2001 From: Will Miles Date: Mon, 5 Aug 2024 11:09:36 -0400 Subject: [PATCH] Walkable: Avoid define on 'realloc' --- src/DynamicBuffer.h | 2 +- src/WebResponses.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/DynamicBuffer.h b/src/DynamicBuffer.h index 5aed8ae0a..e236ee792 100644 --- a/src/DynamicBuffer.h +++ b/src/DynamicBuffer.h @@ -217,7 +217,7 @@ class Walkable // Resize the underlying buffer storage, preserving contents // Returns new size on success, current size on failure. - size_t realloc(size_t s) { + size_t reallocate(size_t s) { if (s <= size()) { auto new_buf = buffer_type(data(), s); if (new_buf) { diff --git a/src/WebResponses.cpp b/src/WebResponses.cpp index a73d0bf5b..8d5045392 100644 --- a/src/WebResponses.cpp +++ b/src/WebResponses.cpp @@ -369,17 +369,17 @@ size_t AsyncAbstractResponse::_ack(AsyncWebServerRequest *request, size_t len, u do { dealloc_vector(_packet); outLen = std::min(outLen, max_block_size); - _packet.realloc(outLen); + _packet.reallocate(outLen); max_block_size = ESP.getMaxFreeBlockSize() - 128; DEBUG_PRINTFP("(%d) Checking %d vs %d\n", (intptr_t)this, outLen, max_block_size); } while (max_block_size < outLen); } else { - _packet.realloc(outLen); + _packet.reallocate(outLen); } } #else //Serial.printf("[%u] %d/%d -> %d\n", (unsigned) millis(), ESP.getMaxAllocHeap(), ESP.getFreeHeap(), outLen); - _packet.realloc(outLen); + _packet.reallocate(outLen); #endif if(_chunked){