fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-02 02:51:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Compact Entry constructor for GlobalDataTypeRegistry::regist<>()

Browse Source
This commit is contained in:
Pavel Kirienko
2014-04-10 22:51:37 +04:00
parent 01328da9eb
commit e567c16fd0
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/node/global_data_type_registry.hpp
+19 -5
View File
@@ -142,23 +142,37 @@ GlobalDataTypeRegistry::RegistResult GlobalDataTypeRegistry::regist(DataTypeID i
return RegistResultFrozen; return RegistResultFrozen;
} }
static Entry entry; static union EntryUnion
{ {
const RegistResult remove_res = remove(&entry); uint8_t buffer[sizeof(Entry)];
long long _aligner_1;
long double _aligner_2;
} storage;
static bool constructed = false;
if (!constructed)
{
new (storage.buffer) Entry();
constructed = true;
}
Entry* const entry = reinterpret_cast<Entry*>(storage.buffer);
{
const RegistResult remove_res = remove(entry);
if (remove_res != RegistResultOk) if (remove_res != RegistResultOk)
{ {
return remove_res; return remove_res;
} }
} }
entry = Entry(DataTypeKind(Type::DataTypeKind), id, Type::getDataTypeSignature(), Type::getDataTypeFullName()); new (storage.buffer) Entry(DataTypeKind(Type::DataTypeKind), id, Type::getDataTypeSignature(), Type::getDataTypeFullName());
{ {
const RegistResult remove_res = remove(&entry); const RegistResult remove_res = remove(entry);
if (remove_res != RegistResultOk) if (remove_res != RegistResultOk)
{ {
return remove_res; return remove_res;
} }
} }
return registImpl(&entry); return registImpl(entry);
} }
} }