From 25d285e2090995a087fec5c4441ea04c6b9dd071 Mon Sep 17 00:00:00 2001 From: Pavel Kirienko Date: Tue, 11 Feb 2014 19:56:09 +0400 Subject: [PATCH] Map<>, TransferBufferManager - isEmpty() calls for runtime checks --- .../internal/transport/transfer_buffer.hpp | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/libuavcan/include/uavcan/internal/transport/transfer_buffer.hpp b/libuavcan/include/uavcan/internal/transport/transfer_buffer.hpp index e1e75934b9..d5a6c64cd3 100644 --- a/libuavcan/include/uavcan/internal/transport/transfer_buffer.hpp +++ b/libuavcan/include/uavcan/internal/transport/transfer_buffer.hpp @@ -326,19 +326,6 @@ public: } } - unsigned int getNumDynamicBuffers() const { return dynamic_buffers_.length(); } - - unsigned int getNumStaticBuffers() const - { - unsigned int res = 0; - for (unsigned int i = 0; i < NUM_STATIC_BUFS; i++) - { - if (!static_buffers_[i].isEmpty()) - res++; - } - return res; - } - TransferBufferBase* access(const TransferBufferManagerKey& key) { if (key.isEmpty()) @@ -398,6 +385,21 @@ public: DynamicTransferBuffer::destroy(dyn, allocator_); } } + + bool isEmpty() const { return (getNumStaticBuffers() == 0) && (getNumDynamicBuffers() == 0); } + + unsigned int getNumDynamicBuffers() const { return dynamic_buffers_.length(); } + + unsigned int getNumStaticBuffers() const + { + unsigned int res = 0; + for (unsigned int i = 0; i < NUM_STATIC_BUFS; i++) + { + if (!static_buffers_[i].isEmpty()) + res++; + } + return res; + } }; }