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

Style fixes

Browse Source
This commit is contained in:
Pavel Kirienko
2014-02-19 17:55:18 +04:00
parent 195dca3696
commit 4f49d61de6
21 changed files with 120 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/internal/map.hpp
+6 -9
View File
@@ -46,22 +46,20 @@ class Map : Noncopyable
IsDynamicallyAllocatable<KVGroup>::check();
}
static KVGroup* instantiate(IAllocator* allocator)
static KVGroup* instantiate(IAllocator& allocator)
{
assert(allocator);
void* const praw = allocator->allocate(sizeof(KVGroup));
void* const praw = allocator.allocate(sizeof(KVGroup));
if (praw == NULL)
return NULL;
return new (praw) KVGroup();
}
static void destroy(KVGroup*& obj, IAllocator* allocator)
static void destroy(KVGroup*& obj, IAllocator& allocator)
{
assert(allocator);
if (obj != NULL)
{
obj->~KVGroup();
allocator->deallocate(obj);
allocator.deallocate(obj);
obj = NULL;
}
}
@@ -77,7 +75,7 @@ class Map : Noncopyable
#pragma pack(pop)
LinkedListRoot<KVGroup> list_;
IAllocator* const allocator_;
IAllocator& allocator_;
KVPair static_[NUM_STATIC_ENTRIES];
KVPair* find(const Key& key)
@@ -176,10 +174,9 @@ class Map : Noncopyable
bool operator=(const Map&);
public:
Map(IAllocator* allocator)
Map(IAllocator& allocator)
: allocator_(allocator)
{
assert(allocator);
assert(Key() == Key());
}