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

Explicit virtual keyword

Browse Source
This commit is contained in:
Pavel Kirienko
2014-04-19 18:51:36 +04:00
parent f31d46ea6c
commit c1be9f1fef
15 changed files with 85 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/dynamic_memory.hpp
+15 -15
View File
@@ -53,13 +53,13 @@ public:
bool addPool(IPoolAllocator* pool);
void* allocate(std::size_t size);
void deallocate(const void* ptr);
virtual void* allocate(std::size_t size);
virtual void deallocate(const void* ptr);
bool isInPool(const void* ptr) const;
virtual bool isInPool(const void* ptr) const;
std::size_t getBlockSize() const;
std::size_t getNumBlocks() const;
virtual std::size_t getBlockSize() const;
virtual std::size_t getNumBlocks() const;
};
@@ -86,13 +86,13 @@ public:
PoolAllocator();
void* allocate(std::size_t size);
void deallocate(const void* ptr);
virtual void* allocate(std::size_t size);
virtual void deallocate(const void* ptr);
bool isInPool(const void* ptr) const;
virtual bool isInPool(const void* ptr) const;
std::size_t getBlockSize() const { return BlockSize; }
std::size_t getNumBlocks() const { return NumBlocks; }
virtual std::size_t getBlockSize() const { return BlockSize; }
virtual std::size_t getNumBlocks() const { return NumBlocks; }
unsigned getNumFreeBlocks() const;
unsigned getNumUsedBlocks() const { return NumBlocks - getNumFreeBlocks(); }
@@ -114,13 +114,13 @@ public:
assert(max_blocks_ > 0);
}
void* allocate(std::size_t size);
void deallocate(const void* ptr);
virtual void* allocate(std::size_t size);
virtual void deallocate(const void* ptr);
bool isInPool(const void* ptr) const;
virtual bool isInPool(const void* ptr) const;
std::size_t getBlockSize() const;
std::size_t getNumBlocks() const;
virtual std::size_t getBlockSize() const;
virtual std::size_t getNumBlocks() const;
};
// ----------------------------------------------------------------------------