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

Add override keyword to those methods requiring it

Browse Source
This commit is contained in:
Peter Barker
2021-10-20 21:33:54 -04:00
committed by Daniel Agar
parent 29e1aa6c12
commit ebfa20c994
14 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/dynamic_memory.hpp
+6 -6
View File
@@ -74,10 +74,10 @@ public:
PoolAllocator();
virtual void* allocate(std::size_t size);
virtual void deallocate(const void* ptr);
virtual void* allocate(std::size_t size) override;
virtual void deallocate(const void* ptr) override;
virtual uint16_t getBlockCapacity() const { return NumBlocks; }
virtual uint16_t getBlockCapacity() const override { return NumBlocks; }
/**
* Return the number of blocks that are currently allocated/unallocated.
@@ -124,10 +124,10 @@ public:
UAVCAN_ASSERT(max_blocks_ > 0);
}
virtual void* allocate(std::size_t size);
virtual void deallocate(const void* ptr);
virtual void* allocate(std::size_t size) override;
virtual void deallocate(const void* ptr) override;
virtual uint16_t getBlockCapacity() const;
virtual uint16_t getBlockCapacity() const override;
};
// ----------------------------------------------------------------------------