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

Fixed GDTR singleton (http://stackoverflow.com/questions/22985570)

Browse Source
This commit is contained in:
Pavel Kirienko
2014-04-10 15:05:55 +04:00
parent d0b541e22d
commit c26c320dd9
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/node/global_data_type_registry.hpp
+6
View File
@@ -60,6 +60,12 @@ private:
mutable List srvs_; mutable List srvs_;
bool frozen_; bool frozen_;
/**
* We can't use function local static variable for singleton because of code size issues:
* http://stackoverflow.com/questions/22985570
*/
static GlobalDataTypeRegistry singleton;
GlobalDataTypeRegistry() : frozen_(false) { } GlobalDataTypeRegistry() : frozen_(false) { }
List* selectList(DataTypeKind kind) const; List* selectList(DataTypeKind kind) const;
libuavcan/src/node/uc_global_data_type_registry.cpp
+3 -2
View File
@@ -10,6 +10,8 @@
namespace uavcan namespace uavcan
{ {
GlobalDataTypeRegistry GlobalDataTypeRegistry::singleton;
GlobalDataTypeRegistry::List* GlobalDataTypeRegistry::selectList(DataTypeKind kind) const GlobalDataTypeRegistry::List* GlobalDataTypeRegistry::selectList(DataTypeKind kind) const
{ {
if (kind == DataTypeKindMessage) if (kind == DataTypeKindMessage)
@@ -115,8 +117,7 @@ GlobalDataTypeRegistry::RegistResult GlobalDataTypeRegistry::registImpl(Entry* d
GlobalDataTypeRegistry& GlobalDataTypeRegistry::instance() GlobalDataTypeRegistry& GlobalDataTypeRegistry::instance()
{ {
static GlobalDataTypeRegistry inst; return singleton;
return inst;
} }
void GlobalDataTypeRegistry::freeze() void GlobalDataTypeRegistry::freeze()