fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-13 20:53:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allocator fixes

Browse Source
This commit is contained in:
Pavel Kirienko
2014-04-12 17:50:32 +04:00
parent 6f1affa51f
commit 3e4234e049
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/src/uc_dynamic_memory.cpp
+1 -1
View File
@@ -45,7 +45,7 @@ std::size_t LimitedPoolAllocator::getBlockSize() const
std::size_t LimitedPoolAllocator::getNumBlocks() const
{
return allocator_.getNumBlocks();
return std::min(max_blocks_, allocator_.getNumBlocks());
}
}
libuavcan/test/dynamic_memory.cpp
+2
View File
@@ -100,6 +100,8 @@ TEST(DynamicMemory, LimitedPoolAllocator)
uavcan::PoolAllocator<128, 32> pool32;
uavcan::LimitedPoolAllocator lim(pool32, 2);
EXPECT_EQ(2, lim.getNumBlocks());
const void* ptr1 = lim.allocate(1);
const void* ptr2 = lim.allocate(1);
const void* ptr3 = lim.allocate(1);